Squashed commit of the following:

commit b9971f3c39e6ee8115af23409043c1e8f459f6da
Merge: 5164d51 f10c7a9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Aug 6 08:27:12 2013 -0700

    Merge pull request #3449 from Mloc/nudge2

    Another tiny change to IRC nudge.

commit 5164d512bfbd9449431f25f99dfb79d2051d49b0
Merge: e73b886 2db7beb
Author: Mloc <colmohici@gmail.com>
Date:   Tue Aug 6 07:58:07 2013 -0700

    Merge pull request #3448 from TwistedAkai/master

    Removed Z-up function from Client/Center()

commit f10c7a90c0c906054ac71ccb4193e58e0e59c58c
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Aug 6 15:55:36 2013 +0100

    Another tiny change to IRC nudge.

    HTML entities are now unescaped so that they show up correctly on IRC.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 2db7beb19c13bf1443260b80d526e9bedbea9903
Author: Akai Alonkai <twistedakai@gmail.com>
Date:   Tue Aug 6 10:46:23 2013 -0400

    Removed Z-up function from Client/Center()

    Turns out this was allowing mecha to travel semi-unrestricted upwards
    through z-levels, including to Central Command and the Away Mission.

commit e73b88633db38cd132e5aeeec1a211e9b8778a2c
Merge: e2d6efc dd303f9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Aug 6 05:47:57 2013 -0700

    Merge pull request #3446 from Mloc/virofixes

    Fixes for virology machinery.

commit dd303f9f82d698688d92d5bab5c2f636160eead2
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Aug 6 11:59:50 2013 +0100

    Fixes for virology machinery.

    Browser UI properly updates on click and on process()
    Dishincubator now properly removes radiation (again)

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit e2d6efcbb8a222a8e1946076a322d0690a3ebd85
Merge: 9176d56 0a4e431
Author: Mloc <colmohici@gmail.com>
Date:   Mon Aug 5 14:44:52 2013 -0700

    Merge pull request #3436 from Segrain/master

    Bugfixes.

commit 0a4e4310fd28912caa175d321703b86cf48e008c
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Aug 6 01:32:34 2013 +0300

    Fix for #3432.

commit 170c66ee8ab8b24958a97a86839d0192cade2e2b
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Aug 6 01:30:49 2013 +0300

    Fix for ERT spawning.

commit 9176d56b56bea1940d9a78a4bb36843d6b9ce98d
Merge: f97e2ec 9a5a1dc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Aug 5 14:19:00 2013 -0700

    Merge pull request #3434 from Mloc/master

    Made IRCbot's password and host a config option.

commit f97e2ecfdacfcbeedf3917656602e4be521e742d
Merge: 0a37520 e969345
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Aug 5 14:18:41 2013 -0700

    Merge pull request #3435 from Mloc/tajkeyfix

    Fixed farwa lying down state.

commit e969345a6e497f22965f55b17ebcf05bd9ecf5be
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Aug 5 14:41:33 2013 +0100

    Fixed farwa lying down state.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 9a5a1dc82c5610ef20e39d66cc182070aa85b7a8
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Aug 5 14:07:06 2013 +0100

    Made IRCbot's password and host a config option.
    Added a hook to send a message to the bot when a round starts.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 0a37520e6147870ca9d87b9b13ba6ec13406509e
Merge: 585120b 440b37d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Aug 4 23:49:07 2013 -0700

    Merge pull request #3431 from Segrain/master

    Bugfix.

commit 440b37dcf44eb8b1e46437db78ee83a25389dc9c
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Aug 5 03:06:31 2013 +0300

    Fix for #3430.

commit 585120ba4f37004edd386a63fa26613807677f5d
Merge: 020bddc 8c6e7fc
Author: Mloc <colmohici@gmail.com>
Date:   Sun Aug 4 07:02:18 2013 -0700

    Merge pull request #3428 from Segrain/master

    Postmerge mapfix.

commit 8c6e7fc987538ce8f29b89d724ba8afb1b77784f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Aug 4 14:34:39 2013 +0300

    Fix for psychiatrist's office.

commit 020bddce0d5ad64b0c5c04234b536ccee3703616
Merge: 75efb06 e45f429
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Aug 3 14:42:24 2013 -0700

    Merge pull request #3424 from comma/master

    New stuff

commit e45f429e4cac1e6a176e99b5351e01b8c02d4702
Merge: 2accdce 0091294
Author: comma <krauchinsky@gmail.com>
Date:   Sun Aug 4 01:40:32 2013 +0400

    Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

    Conflicts:
    	code/modules/mob/living/silicon/robot/robot.dm
    	maps/tgstation.2.1.0.0.1.dmm

commit 2accdce083662c4f2526ffea0673cac10f622029
Merge: 1dfb3ab 75efb06
Author: comma <krauchinsky@gmail.com>
Date:   Sun Aug 4 01:12:27 2013 +0400

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

    Conflicts:
    	code/game/machinery/iv_drip.dm

commit 0091294204fdb0ca979d4a2abc6c8c1837d1fd05
Merge: a8e4a51 747c710
Author: Mloc <colmohici@gmail.com>
Date:   Sat Aug 3 14:08:57 2013 -0700

    Merge pull request #3418 from comma/dev-freeze

    Fixed monkeys not getting space rabies via syringes.

commit 75efb066480257de768c87a694a592ff86683fd3
Merge: 92fb88a 51fedda
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Aug 3 13:47:07 2013 -0700

    Merge pull request #3421 from Segrain/master

    Mapfix for medical doors.

commit 51feddafa631ce704b24e490d6d95b728c5d43d3
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Aug 4 00:35:35 2013 +0300

    Medical doors fix.

commit 747c71096e87748cc97777bec7e048076e9a844e
Author: comma <krauchinsky@gmail.com>
Date:   Sun Aug 4 00:32:37 2013 +0400

    Fixed monkeys not getting space rabies via syringes.

commit 92fb88a254c50099efd53b932b7e3cad8ef6e0e4
Merge: 18eb59c 35e7ec3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Aug 3 07:20:59 2013 -0700

    Merge pull request #3416 from alex-gh/fix_cyborg_vending_hack

    Allow cyborgs to hack vending machines

commit 35e7ec32284fb9d07a1a3574d1ba0f84da0d452e
Author: Alex <alexgh@sempto.net>
Date:   Sat Aug 3 14:08:27 2013 +0200

    Allow cyborgs to hack vending machines

commit 18eb59cf7347b2964f0418273daab52718b2be05
Merge: eea0f19 d21a29d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Aug 2 16:15:10 2013 -0700

    Merge pull request #3412 from Segrain/master

    Runtime error fix.

commit d21a29dc090f59b81487450a3119a656340d7701
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Aug 2 19:09:54 2013 +0300

    Runtime error fix.

commit eea0f190de13c240f050b0cf42ef4f82d99f35f3
Merge: f802201 c2712dd
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Aug 1 14:03:45 2013 -0700

    Merge pull request #3409 from Segrain/master

    Bugfixes.

commit c2712dd9d35d87e7d2af2bcda159698ddab30c25
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Aug 1 20:58:35 2013 +0300

    Fix for #3410.

commit fb4552f394b6aaf35ebe3bbba56d5a2c39d15f7f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Aug 1 17:15:16 2013 +0300

    Fix for #3383. Again.

commit 2e2cca058cd74390b0fddb6dd05b9ea3c56b60da
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Aug 1 17:11:12 2013 +0300

    Fix for #3406.

commit f80220140415c661d972d70ae49e57eff3679df0
Merge: e860191 f14a4b1
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 31 15:21:44 2013 -0700

    Merge pull request #3402 from Segrain/master

    Mapfixes.

commit f14a4b17699aa9a11e045b76a849e09317cbf588
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jul 31 13:55:24 2013 +0300

    Piping and wiring fixes.

commit e860191c5be51bb4d4968ba16f344bb3a0ef29d9
Merge: 0a022c0 8021250
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 31 01:53:21 2013 -0700

    Merge pull request #3401 from Segrain/master

    ERT cameras on master.

commit 80212508044b1e35a1096183529766e6153d6892
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jul 31 10:32:19 2013 +0300

    Type mismatch fix.

commit 0a022c01ee3fe29fbd3de369ba0c431fa2447295
Merge: 354ed0e 89ffc92
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 30 14:46:16 2013 -0700

    Merge pull request #3398 from Erthilo/master

    Moar fixes.

commit 89ffc921686fff0b7f639a74ac6a54811e307d10
Author: Erthilo <erthilo@gmail.com>
Date:   Tue Jul 30 22:36:42 2013 +0100

    Fixes text errors in ghost manifest runes and newscasters with apostrophes.

commit 354ed0ed900aac8ab464520ca6f8607f2fecc15b
Merge: 76f8536 02f7e34
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 30 14:16:19 2013 -0700

    Merge pull request #3397 from Erthilo/master

    Bugfixes.

commit 02f7e34f66fe1250d7a252b1bfab7edaec43364d
Author: Erthilo <erthilo@gmail.com>
Date:   Tue Jul 30 20:43:02 2013 +0100

    Changelog.

commit d591c1ef75f786ce3aeafc03c02e95c6a8905db1
Author: Erthilo <erthilo@gmail.com>
Date:   Tue Jul 30 20:26:08 2013 +0100

    Hotfix for EFTPOS and ATM machines not connecting to databases.

commit 9bbf43407f4ea94b5240d0775ef182620d849d38
Author: Erthilo <erthilo@gmail.com>
Date:   Tue Jul 30 20:06:37 2013 +0100

    Fixes Gravitational Catapult not detaching.

commit 76f8536850330e8c1ae6d72d0ce22a2190732588
Merge: 27c1bce 24bc26f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 30 09:15:01 2013 -0700

    Merge pull request #3393 from Segrain/master

    Bugfixes.

commit 24bc26fd13ece9dea97444960ba6be24a09a94cf
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 30 19:13:42 2013 +0300

    Fix for table/computer cross-detection.

commit 578a020c8bb4d7c07ff385abb8fc58bbb7aa7947
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 30 12:15:12 2013 +0300

    Fix for #3392.

commit 27c1bced7f56fe6d972f3e97d2bd371eea5ded11
Merge: b019491 a39aff3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jul 29 12:13:22 2013 -0700

    Merge pull request #3385 from Zuhayr/master

    Taser runtime fix.

commit a39aff347115f266f0d38fe441dd83c615a2158b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 29 12:51:20 2013 -0700

    Removed a very very redundant check in the ablative armour code. Thanks Segrain.

commit 5adc32cf8e0a93e55d6c080d1977dac12ea536d6
Merge: b1ac1d5 ea90788
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 29 12:15:23 2013 -0700

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit b1ac1d58f96e9fbc5614f36eeeb74d250651b861
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 29 12:15:04 2013 -0700

    Fixes #3383

commit b019491b863fc4bd5a4852d7874ead2d5b95ea5d
Merge: 22333d0 2bd41fa
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jul 29 12:12:16 2013 -0700

    Merge pull request #3390 from Segrain/master

    Map fixes.

commit 2bd41fafa6b087bcd49425d197447dc1f4c23c19
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Jul 29 15:02:46 2013 +0300

    Quickfix for fix.

commit b63a5e65254e82b2819a19519dd911704407d62d
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Jul 29 14:56:24 2013 +0300

    Fix for #3381.

commit 68b91ec5dd5d8ec03d5b0a8129dc2d3f26045cff
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Jul 29 14:15:15 2013 +0300

    Fix for #3344.

commit 22333d0ca919c314e24f155def7732f0f4be8962
Merge: d9d8bcf 1498c57
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 29 01:54:43 2013 -0700

    Merge pull request #3389 from meyar/master

    Camera's got lost in the shuffle.

commit 1498c5748e136fa3971a39e3920ea05d06b7cd38
Author: meyar <grimreaper219@hotmail.com>
Date:   Mon Jul 29 04:34:28 2013 -0400

    Camera's got lost in the shuffle.

commit d9d8bcfb44db2ea4c638ed5fa636b371eaf062a8
Merge: ea90788 4cc39c5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 29 01:04:29 2013 -0700

    Merge pull request #3388 from meyar/master

    ERT fixes

commit 4cc39c554e86eea9b7b04e6d30b92bf4d267ce33
Author: meyar <grimreaper219@hotmail.com>
Date:   Mon Jul 29 03:46:23 2013 -0400

    Disables the duplicate Response Team file. They've been unified.

commit de0c03248671278025775f1d7ec12252c5ee8c28
Author: meyar <grimreaper219@hotmail.com>
Date:   Mon Jul 29 03:45:49 2013 -0400

    Turns two ERT files into one. Also fixes the ERT admin button being bork.

commit a8e4a510229f1f54c1ed80143cc5e8eaa16b532f
Merge: 2d85dab ea320dc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 28 22:47:13 2013 -0700

    Merge pull request #3386 from Segrain/dev-freeze

    Dev-freeze bugfix.

commit ea320dca6756e419a07a4f9dc9ee17da9621bec4
Merge: da27868 cf4f9ba
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Jul 29 08:15:54 2013 +0300

    Conflict fix?

commit da2786891adbf4c24f0f0dac1c854003fc1a59c1
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Jul 29 08:12:02 2013 +0300

    Fix for #3337.

commit ea9078830a80805fc2848defb8d3467967c82310
Merge: 0170269 cd72596
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 28 19:13:13 2013 -0700

    Merge pull request #3384 from SkyMarshal/airfixes

    Fixes a bug with heat transfer.

commit cd72596249832280d1719909d71308c042b8b25a
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Sun Jul 28 19:11:05 2013 -0700

    Fixes a bug with heat transfer.

commit 0170269bc65671eed46a61a27bc3c92e3eb9a118
Merge: 6e13f5f fdce68f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 28 10:35:44 2013 -0700

    Merge pull request #3379 from Segrain/master

    Magboots bugfix.

commit fdce68fe66202fc82b35d8acffeb956739d204e5
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Jul 28 14:31:23 2013 +0300

    Magboots fix.

commit 6e13f5fbf082058057dae69720f8d77c43d97815
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 26 18:31:11 2013 +0100

    Readme clone URL fix.

commit 2659196619bd3a45a4f6805b777255f5a4a49f7e
Merge: d555c3e 1670ed8
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 26 08:49:55 2013 -0700

    Merge pull request #3360 from Zuhayr/master

    Nerfed the combat borg, fixed borg sprite reset issue.

commit 1670ed805110d59e8e8ee678e545d41abe19928a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 27 01:08:27 2013 -0700

    Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices.

commit 37aef47198e019ba7f9c19d9fab963e02a3e2965
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 27 00:48:50 2013 -0700

    Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode.

commit c09d07bb8292ba9ba893bc5573578740b7675c3c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 27 00:09:19 2013 -0700

    Added tool steps to manually remove the bolts on a deployed nuclear weapon.

commit d555c3e69716430c5b774998fa9a15da877e3a8e
Merge: 6c9ba7a c09d07b
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 26 07:13:28 2013 -0700

    Merge pull request #3359 from Zuhayr/master

    Added tool steps to manually remove the bolts on a deployed nuclear weap...

commit 6c9ba7a472ffb9f4fbb88fcba00b7dd9ab698982
Merge: 8124f7b 72c331b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 25 21:38:07 2013 -0700

    Merge pull request #3356 from SkyMarshal/master

    Several ZAS fixes.

commit 72c331bfa797654d0515a891f287c46807fdcb5f
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Jul 25 21:34:12 2013 -0700

    Several ZAS fixes.
    Adds insulation to doors, modifiable by admins from the ZAS setting panel.
    Fixes a logic error with connections.  (I am dumb some days)
    Improves the runtime detection and reporting.
    Improves "zone info" debug verb.

commit 8124f7bfe783403e06a1004efe8d1b30ce3db178
Merge: 4a0ebb4 d02d50d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 25 06:40:21 2013 -0700

    Merge pull request #3352 from Mloc/zasfixes

    ZAS fix.  It should now be possible to repair breaches without admin int...

commit d02d50d0ce435bcacff6354d7c812a1901b3e36f
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Thu Jul 25 14:31:31 2013 +0100

    ZAS fix.  It should now be possible to repair breaches without admin intervention.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 4a0ebb49ef294e65141c87a2a75bfa9735848572
Merge: 4805c6b cf4f9ba
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 24 18:51:16 2013 -0700

    Merge pull request #3348 from Segrain/master

    Minor bugfixes.

commit cf4f9ba054c5fdf5d5915d1c13d5c145e8cabd56
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jul 25 03:06:06 2013 +0300

    Typo fix, retractor step bugfix.

commit a17e456a97e28dc64ba620cfc08fca264b918731
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jul 25 03:04:28 2013 +0300

    Defaulting LOOC to being toggled on.

commit 85f82219bad69b9be101a708a123b0cf4fa2d3ea
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jul 25 03:03:14 2013 +0300

    Fix for #3345.

commit 4805c6b57ce5f6e3cb982401db9eaf8b035200be
Merge: adc75dd 2a825e6
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 24 14:47:30 2013 -0700

    Merge pull request #3346 from Mloc/zas-absolution

    Made most paths in ZAS absolute, for easier searching.

commit 2a825e6ccaadf96f1c1c0aac7cafb065a86a2c32
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Wed Jul 24 21:13:48 2013 +0100

    Made most paths in ZAS absolute, for easier searching.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit adc75dd423430d437f6b338f86ec4b0029c78529
Merge: 580f7cf 09db9f1
Author: Mloc <colmohici@gmail.com>
Date:   Tue Jul 23 15:39:24 2013 -0700

    Merge pull request #3340 from Mloc/master

    Nerfed snoring frequency.

commit 09db9f1ff09e6e981572254e130163ab74987454
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 23 23:38:49 2013 +0100

    Nerfed snoring frequency.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 580f7cf4192cb9f2e36405522a6371cc9ab574a8
Merge: 7a43876 eaf4b7c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 23 12:28:23 2013 -0700

    Merge pull request #3338 from Mloc/master

    Absoloutely massive (1 character) fix for virology.  Pathogenic incubato...

commit eaf4b7cf490ffa4423d8e648def9131fd8c6ec6f
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 23 19:48:56 2013 +0100

    Absoloutely massive (1 character) fix for virology.  Pathogenic incubator radiation now goes down as intended.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 2d85dab901d2df6ea25c4b264e2d37dc04f8b5c6
Merge: 2bec00d 098f0f6
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 20:55:31 2013 +0100

    Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev-freeze

commit 098f0f60e262d7175c65aedfa6d76568aabf7988
Merge: 2ce34fd 8766e41
Author: Mloc <colmohici@gmail.com>
Date:   Mon Jul 22 12:54:41 2013 -0700

    Merge pull request #3335 from Kilakk/dev

    Changed medical records "physical status" list to something more fitting, and fixed an issue with taking your ID out of the medical computer

commit 8766e4154dc8405faf01639455fb5820b4190cb0
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Mon Jul 22 15:10:25 2013 -0400

    Changed the list of p_stats available in medical records
    Made it so removing an ID card from the medical computer puts the ID into your hand rather than onto the computer

    List:
    Active, *SSD*, *Deceased*, Physically Unfit, Disabled

commit 2bec00d4e7323977a8fa695c17dfc59d36a59519
Merge: 2123389 2ce34fd
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 17:47:45 2013 +0100

    Merge branch 'dev' into dev-freeze

commit 2ce34fd0244a0cb92a9c484553a57c6ac7be0c7c
Merge: bdaabae e7f38be
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Mon Jul 22 09:46:20 2013 -0700

    Merge pull request #3334 from Mloc/beakers

    Beaker changes

commit e7f38be3b4f1f76c605d141f85a1f50cd98cbf8d
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 17:38:34 2013 +0100

    Beakers and other glass containers now hide their contents, only showing the amount.
    Additionally, they can be labeled with a pen, up to a max of 10 characters.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 8421cd44dfbe774fc6a0a7765248d187180a6d94
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 17:37:39 2013 +0100

    Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 7a438762eea23eaf2bbf121606b7ddd2757589ab
Merge: 15f0853 c79a501
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Mon Jul 22 08:19:27 2013 -0700

    Merge pull request #3332 from Mloc/airflowsound

    Remove the sound played on airflow, due to intense lag and eight-and-a-h...

commit c79a501a12dd1f33cc25d7cfb1e1d3cfd8203591
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 16:13:39 2013 +0100

    Remove the sound played on airflow, due to intense lag and eight-and-a-half million calls of playsound in an hour.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit bdaabaec463576b6996f68db9a703f266ca5b605
Merge: 8575b7a 15f0853
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 14:42:50 2013 +0100

    Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

commit 2123389f94c13c4d1a8020a57d2d985e9701d110
Merge: 8575b7a 15f0853
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 14:42:31 2013 +0100

    Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

commit 15f0853ea248cbad6f1a4e7885ba1f22ee51876f
Merge: a344010 3889716
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 22 04:04:00 2013 -0700

    Merge pull request #3331 from BcTpe4HbIu/airalarm_fix

    Airalarm fix

commit 3889716dd6dfb7f497c95fe33d3bfdf80eacad1f
Author: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org>
Date:   Mon Jul 22 10:26:48 2013 +0400

    Fix Issue #3327

commit da14500268017fc7c6020452eb8daf7ad045cc1c
Author: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org>
Date:   Mon Jul 22 09:19:19 2013 +0400

    Add error reporting on failed DB connection.

commit a344010db4ab8cb4bb4c3fdd2a457243729ac45b
Merge: f9b6ef3 d369b9f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jul 21 18:50:12 2013 -0700

    Merge pull request #3330 from Kilakk/master

    Compile fix (read: I'm an idiot)

commit d369b9fffff3cd25cdbfb6697b275d3e68164385
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Sun Jul 21 19:49:30 2013 -0400

    Compile fix (read: I'm an idiot)

commit f9b6ef3593a8b59d71c00063fe23db3a258e9642
Merge: 09c1745 f0e0951
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jul 21 16:42:29 2013 -0700

    Merge pull request #3328 from Mloc/master

    Bugfixes.

commit 09c17452e8e29d573dd649f2e4b6fd7cd89aff1a
Merge: 2288dc8 e948341
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jul 21 16:40:02 2013 -0700

    Merge pull request #3329 from Kilakk/master

    Small batch fix, voting cleanup, admin-ERT verb uncomment

commit e9483415d311c4df64a8f4c403cd84da4bdad1eb
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Sun Jul 21 19:38:32 2013 -0400

    Fixes #3326 - uncommented admin-ERT verb

commit afeb753f8e9c72fc3172fe29526e446793e02cc4
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Sun Jul 21 19:26:05 2013 -0400

    Cleaned up vote oocmute a tad

commit 95e9cdde8d7c8caaf4e06de6eab695b90069bdd5
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Sun Jul 21 19:25:18 2013 -0400

    Fixed a really stupid batch mistake

commit f0e0951c1cc94ed220f0ff169da9e9e30f3ff043
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 22 00:18:24 2013 +0100

    Fixes #3230.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit c135d19b66696096f6f462fe611f696c6b45b1ec
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sun Jul 21 17:05:10 2013 +0100

    Partial fix for #2284.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit e4b67a346652ba181797cb98f2bf8d4fb0921519
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sun Jul 21 16:55:30 2013 +0100

    Fixes #3104.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit eef12bf2520cc18bc49da7c8896ed44c3e9efef3
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sun Jul 21 15:03:49 2013 +0100

    Fixes #3324.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 8575b7a2863ab780e4cdf4f334b88890b3677284
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sat Jul 20 18:41:50 2013 +0100

    And once again, did that the wrong way around.  Whoops.
    Fully reverts #3316.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit adc3c14779faaa4c609345f2d0e1e1989fed1013
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sat Jul 20 18:38:00 2013 +0100

    Revert #3316 from BEF due to compile errors and (assumed) missing files.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit f29cd5946fadaf5099d619d90dde4fc679b6c687
Merge: c616d2b 2288dc8
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 19 14:48:40 2013 +0100

    Merge branch 'master' into bleeding-edge-freeze

commit 2288dc8abf0b3ca7969caa172057bb2b0aae365a
Merge: cfe45f9 46f808e
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jul 14 16:12:53 2013 -0700

    Merge pull request #3318 from SkyMarshal/airfixes

    Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.

commit 46f808edf40eca70b7e53c9fd84238793fb9d49b
Author: SkyMarshal <joehe.inemeyer@gmail.com>
Date:   Sun Jul 14 16:09:08 2013 -0700

    Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.  Should still be verified on the live server before considered resolved.

commit c616d2b1c1e152d110f6230a151bcc9cb843d747
Merge: b777ae4 5d63943
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jul 14 15:13:46 2013 -0700

    Merge pull request #3316 from LordBraindead/bleeding-edge-freeze

    fire update

commit 5d63943d0742239b353eabcb4eb46c07078c98f4
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sun Jul 14 21:50:48 2013 +0200

    Update mineral.dm

    removed sheettpye = "plastic" again because it snuck back in after being removed already

commit f172e085b18f9ab1fe67464f90b772f96f588150
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sun Jul 14 21:40:32 2013 +0200

    Update changelog.html

    underped the changelog too

commit 53c73f6b85dc3c9c3030c2cf75814e1cd4f273fc
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sun Jul 14 21:22:09 2013 +0200

    Update power_cells.dm

    derped a debug message into the commit

commit 08d2e2222081b288bc239ae8ac24e8d0ce95dfd7
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sun Jul 14 21:20:45 2013 +0200

    fire update

    enabled fire to destroy floors and objects
    also tweaked the behaviour of glass to enable glasslocks against fire
    also made fire extingiushers stop being useless

commit cfe45f92714d9e7ace619032f560a593ace17b1b
Merge: 6c6b305 07b9c30
Author: Mloc <colmohici@gmail.com>
Date:   Sat Jul 13 03:03:12 2013 -0700

    Merge pull request #3310 from Zuhayr/master

    Vox fixes.

commit 07b9c30354d9e3f9046c3e9e99d6e46f2ef0206a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 13 16:23:13 2013 -0700

    Vox raid spawn fixes.

commit 7faf895563858190ad944033ef1375478cea2812
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 13 04:35:50 2013 -0700

    Robots will now spawn fully equipped.

commit dbe4838d40687c82bcc2013fab041e9f41ae2586
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 13 04:34:09 2013 -0700

    Purging the toddler as Lord Mloc commands.

commit 71f36969b83311215ea84a2bc3fe0fe0b81d5ac7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 13 04:33:48 2013 -0700

    Robot health buffs, addition of armour component.

commit 6c6b305f8f9e02742aa3362d98728113302e17e1
Merge: 836aab6 85f4403
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jul 13 01:42:44 2013 -0700

    Merge pull request #3309 from fauxki/master

    Master - Map Fixes

commit 85f4403ac2a9a38ffe468e72571e0619782ede7b
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sat Jul 13 00:36:48 2013 -0700

    Master Map Fixes
    - Properly aligns doors in AI core and Gateway room.
    - Fixes issue with engineering pod getting it's nose cut off by moving it to the correct transit zone.

commit 836aab6378320acf1818883b1cbec72d633f3d44
Merge: 1af9a7b 7faf895
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 12 11:36:27 2013 -0700

    Merge pull request #3307 from Zuhayr/master

    Robot fixes, removal of toddler item.

commit 1af9a7bc60c5743ff4e26c5ea0f6ff59f0cfe171
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 12 15:20:49 2013 +0100

    Git, I shall never understand thee.  Oh well.

commit cac7a5420e66610d2618c2c664bbad04d08b656a
Merge: b5c63c2 29cb9ef
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 13:32:36 2013 +0100

    Merge branch 'master' of github.com:Baystation12/Baystation12

commit b5c63c2a6608e93dddff4d2bc070d2b30f088e57
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 13:31:26 2013 +0100

    I have honestly no idea what happened there.  Fucking git.

    This reverts commit a2fddc0fc1e0ba1b9040fbe9fec9a4b00767eb17.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit c3c84614b84db97d19b2a8c7bcc499e6ed3bc435
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 13:10:48 2013 +0100

    Update MOTD for new bugtracker link.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit c6a9bbc9fcc4c2ae22db30681a5bd9a1eb6e0acf
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 12:48:07 2013 +0100

    Properly reverts Kida.  (what a mess)

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 29cb9efa04d85780e4e6f3b6ba6fa9c812534a34
Merge: 84829a0 c3c8461
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 12 04:15:13 2013 -0700

    Merge pull request #3306 from Mloc/master

    Update MOTD for new bugtracker link.

commit 84829a0a350683947c5d20e3d59e0f9bd6503750
Merge: 17ff989 c6a9bbc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 12 03:51:00 2013 -0700

    Merge pull request #3305 from Mloc/master

    Properly reverts Kida.

commit 17ff989194d603f0e50550bca1b002b4c035b2c0
Merge: 6a714f3 66a8536
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 12 03:32:10 2013 -0700

    Merge pull request #3304 from Mloc/master

    Removes Kida

commit 66a8536c943188963d04ce7f24d00e32c335687a
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 12:22:58 2013 +0100

    Revert "Adds in the icon files for Kidan and fixes issue"

    This reverts commit 9139a70d8cbe4fc3fbe568162628b7fdf07cb265.

commit cf53dd7a10dd2976767d2217b02204ca4147bb2d
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 12 12:22:35 2013 +0100

    Revert "Adds in the Kida"

    This reverts commit a2fddc0fc1e0ba1b9040fbe9fec9a4b00767eb17.

commit 6a714f3613ce5a43eec969628ae1093e3fe9b54d
Merge: 97eddd0 c27f3ef
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 12 01:26:34 2013 -0700

    Merge pull request #3300 from Spamcat/master

    meatfix revert

commit 97eddd08983d28c64735500a679b35d9a342557f
Merge: c9eeaa8 b5b58e5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 12 01:26:10 2013 -0700

    Merge pull request #3299 from Segrain/master

    Runtime error fixes for random events.

commit c27f3efb8eb2b428a0ccc89edeb3c839416eb7e7
Merge: 4ceb12b c9eeaa8
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 12 03:06:41 2013 +0400

    Merge branch 'master' of github.com:Baystation12/Baystation12

commit 4ceb12bb1c88eedb1dfdb5a66ff87feb6b62a2ee
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 12 03:03:46 2013 +0400

    Revert "Quickfix for INFINIMEAT."

    This reverts commit 654a83be9d9e6879cc4abe61cc0cb92f12721d46.

commit b5b58e5ebe1c0f4d23a8e1968b39c7f7e5cfe056
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jul 12 00:00:59 2013 +0300

    Runtime error fix.

commit f7b22fa91191feb2a01bda6914a5c9311859be25
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jul 11 23:14:56 2013 +0300

    Quickfix.

commit c9eeaa804a783ab26e67d9c7cd7588280b49343d
Merge: 67cc137 e4b4486
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 11 11:28:56 2013 -0700

    Merge pull request #3298 from caelaislinn/master

    EFTPOS tweaks and fixes

commit e4b448676885c21a93888127fdc76902d0fcf43c
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Fri Jul 12 03:40:38 2013 +1000

    added a spawning guide to EFTPOS devices

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

commit 4421bede170d3e98c00b33f57283f5371423ba39
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Fri Jul 12 03:40:06 2013 +1000

    moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime

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

commit b777ae4bac1d29e24a522872c2ec69f93f687e59
Merge: c5e2f86 da35278
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 10 22:18:42 2013 -0700

    Merge pull request #3275 from comma/viro

    Virology changes

commit da352784398196081cdb86e40cd2fdfe13ff6449
Merge: 1a03079 aaa1228
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 02:53:58 2013 +0400

    Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro

    Conflicts:
    	html/changelog.html

commit aaa1228e1180ba64e370d8f15ec4bc2b469ea211
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 02:52:36 2013 +0400

    Changelog.

commit 1dfb3ab203a34a0d1f2ea44e63088e4b1676d29f
Merge: 4b3af6d 67cc137
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 02:48:30 2013 +0400

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit 4b3af6d6e251a65d8834315bd32dc86dbafc7006
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 02:20:07 2013 +0400

    Removed that ugly hack that deletes cryoxadone from beaker
    It's counterintuitive IC (IV destroys all clonex when beaker is in), and alleged 'infinimeat crashing server' is complete bullshit.
    Same amount of meat can be achieved with syringes and beakers, or two big beakers. Spawn speed is not anywhere gamebreaking too.

commit 67cc13751a792785169437afb8424bd42788ac6e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jul 11 02:09:01 2013 +0400

    Derp.

commit e820e28f7899baa02e44abab1c90255b77896c7d
Merge: 9ab1cc0 47c6901
Author: Mloc <colmohici@gmail.com>
Date:   Wed Jul 10 14:36:32 2013 -0700

    Merge pull request #3292 from comma/master

    Fixes

commit 47c6901df3dfbc4f83e7eae81a3950ee8c22838d
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 01:30:16 2013 +0400

    Fixes #3018
    Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).

commit 81e22ea2700b76a4d8a6cfb63122d2bb3f5a378b
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 00:59:44 2013 +0400

    Fixes wires on air alarm not displaying cut status properly.
    Fixes #3087

commit c791208efc51c1fca777865168a92a13a84dc918
Author: comma <krauchinsky@gmail.com>
Date:   Thu Jul 11 00:12:51 2013 +0400

    Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process.

commit 9ab1cc0d85c70436e432bb83be96c5bfc787194e
Merge: db744e3 10b0ef1
Author: Mloc <colmohici@gmail.com>
Date:   Wed Jul 10 12:01:43 2013 -0700

    Merge pull request #3291 from Spamcat/master

    Small fixes

commit 10b0ef11abe91791a6b1f21a93b77fcddbe675cf
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed Jul 10 22:58:23 2013 +0400

    Fixed #3290.
    <_< you saw nothing >_>

commit 45e775f5e92e239a78ffe66e0ce6e934e0f43e38
Author: comma <krauchinsky@gmail.com>
Date:   Wed Jul 10 22:49:10 2013 +0400

    Standardized proc definitions in alarm code.

commit f1cfb96dabe66508153fa214e8649a8738d952dc
Author: comma <krauchinsky@gmail.com>
Date:   Wed Jul 10 22:39:27 2013 +0400

    Fixes #3225. Adds separate toggle for LOOC.
    Fixes #3285. Changes way hearers are found, so it includes pAIs now.
    Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.

commit bdaeb2c6fb369418c6dac7d15b5a94a598b334cd
Author: comma <krauchinsky@gmail.com>
Date:   Wed Jul 10 21:19:21 2013 +0400

    Adds fire delay to all weapons (except automatics).
    For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
    Shotungs do not get special delay because they are slow as they are anyway.
    Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.

commit 8e1ffe69de8e1dfb22c4b29fa11d9de3ad26e106
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed Jul 10 21:06:35 2013 +0400

    This one isn't used currently and is only confusing people.

commit fc294110cc204cf8da62a7510f0036987854e60a
Merge: aa1310a db744e3
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed Jul 10 20:55:42 2013 +0400

    Merge branch 'master' of github.com:Baystation12/Baystation12

commit db744e36e709dea2c78d4da5c90805b80f108f60
Merge: 0091073 a8a474b
Author: Albert Iordache <iordachealbert@gmail.com>
Date:   Tue Jul 9 14:22:28 2013 -0700

    Merge pull request #3288 from Zuhayr/master

    Combat adminspawn-only fix.

commit a8a474bca9a67f342b3f885030f95e9c1f1cecbc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 10 07:20:06 2013 -0700

    Changed combat module to VV only pending rebalancing.

commit e6cb87154487b9a68ab8cafd5b8de4e0965d4620
Merge: a9c3187 0091073
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 10 07:15:52 2013 -0700

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit 1a03079a669da13d065f5e939c97fd94e6fe26a5
Merge: 722d4d2 c5e2f86
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 23:08:41 2013 +0400

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit 0091073003d0b3d248eeaf43345b5eb16b416bfe
Merge: 6dc35bb 21ac3e5
Author: Mloc <colmohici@gmail.com>
Date:   Tue Jul 9 11:01:45 2013 -0700

    Merge pull request #3282 from Segrain/master

    Bugfixes.

commit 21ac3e5954c506615282cfc109116703fcf85d87
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 21:08:31 2013 +0300

    Fix for #3286.

commit 46df500cd478885a65285e3b33dc54162ab1cf24
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 19:37:17 2013 +0300

    Fix for #3166.

commit a3d2a1e70fd845abb2a769897c84ee62c2d527cf
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 17:17:55 2013 +0300

    Fix for #3281.

commit c5e2f86cc31b4a75e6ad4ebabacda95124bf4203
Merge: ba894be c41abfc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jul 9 07:17:29 2013 -0700

    Merge pull request #3283 from fauxki/bleeding-edge-freeze

    BEF - Map / DMI / Closet

commit c41abfc9293f32381d0b062724b2d928f953b43f
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Jul 9 07:02:17 2013 -0700

    Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!

commit 01d5a0f4d355eb21eea9a7c7c705f7a0dd4bf19f
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Jul 9 07:02:01 2013 -0700

    Monkey Mob DMI Changes
    - Changes Farwa sprite to the one Fox approved of before he stepped down from whitelister of tajs.
    - Also re-adds in the pun pun sprite since that got removed.

commit 330f9176b0d32a4c0403205aad6fff1feda7ae96
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Jul 9 07:01:06 2013 -0700

    Map Edits
    - Expanded Psych Office.
    - Added second toolbelt to robotics.
    - Fixed issue of the bar maintence door being in the kitchen cold room. Also fixed the mislabled camera. Oooops.
    - Added one each of the alien baby races to genetics.
    - Fixes misaligned AI door.

    I'm going to have another map edit up shortly, as I want to work on some areas, but am waiting for Chinsky to finish his stuff first.

commit 6dc35bb707e94597b1254c9f837d72a05a13c883
Merge: 1c3b82d 8fd2590
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 9 06:18:53 2013 -0700

    Merge pull request #3279 from Mloc/nudgefix

    Nudgefix

commit 1c3b82db168937780f9e914fae858128f06c4243
Merge: 9a7148b 3f8c726
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jul 9 05:18:44 2013 -0700

    Merge pull request #3277 from Mloc/master

    Cleaned up config files.

commit 8fd2590362434501c1e88bdca33d5ae7bdbdef81
Merge: 22823d6 9a7148b
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 9 13:10:42 2013 +0100

    Merge branch 'master' of github.com:Baystation12/Baystation12 into nudgefix

commit 22823d633ddfb558a235cfbb6e07f68cc8287e27
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 9 13:10:16 2013 +0100

    Quickfix for IRCbot nudge

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 722d4d27fbc282f3a4717af87394741a54ab9772
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 16:07:58 2013 +0400

    Fixed a typo.

commit 3f8c726815a3f27a722ece91157de78cde87caed
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 9 12:59:14 2013 +0100

    Cleaned up config files to be more generic; main server isn't mirrored from these any more, and they are horribly out of date.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit ba894becedb038d21581970e3354f59d7008f7e2
Merge: 01f2c52 ae2a9c5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jul 9 04:40:06 2013 -0700

    Merge pull request #3274 from comma/bleeding-edge-freeze

    Master -> BEF

commit 2509e8f8366c1b5d28e3cf2a50c6c6d37f96def7
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 14:19:05 2013 +0400

    Changelog entry.

commit e0f7097c23a4d2c3660d1f5b3f568942d883ca05
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 14:16:58 2013 +0400

    Makes engineered viruses airborne too, since otherwise they are nigh useless.

commit 74e75c71b7435f859b9ca2349872a30d1da61e8c
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 13:59:34 2013 +0400

    Replaced viro machinery with new one.

commit aa1310a44ff7fbede52047c97b3b18c3cb538eda
Author: Spamcat <spamcat@derpy.ru>
Date:   Tue Jul 9 13:40:04 2013 +0400

    Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request.

commit d5942c4b1023cac4b16effde73695839bf4c2268
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 13:04:05 2013 +0400

    Updated HUDs to find only known viruses.

commit 1095bd197835d756ea74ed96a8ed511db37832eb
Merge: 50f94dd ae2a9c5
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 12:49:23 2013 +0400

    Merge branch 'bleeding-edge-freeze' into viro

commit ae2a9c56ada7ff899d965a308cd71b579de13acc
Merge: 01f2c52 9a7148b
Author: comma <krauchinsky@gmail.com>
Date:   Tue Jul 9 12:48:34 2013 +0400

    Merge branch 'master' into bleeding-edge-freeze

    Conflicts:
    	code/modules/mob/living/silicon/robot/robot.dm

commit 9a7148bf8c1eb51563c921c35df18e7b529f8ceb
Merge: 75c8f6d c5a1a69
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jul 9 01:42:50 2013 -0700

    Merge pull request #3271 from Segrain/master

    HUD bugfixes.

commit c5a1a69b5ba66824cb543305ef03b05f4f785e52
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 05:06:29 2013 +0300

    Stealth/invisibility tweaks.

commit 965b0c419e197e55cbeb89ca645de9c37a31f7e9
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 04:59:02 2013 +0300

    Space ninja suit: stealth mode.

commit 14dbcad07d281a930e715226e00f32eda9afe94f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 04:53:34 2013 +0300

    HUDs and visibility.

commit 72588c8c6192cbcc1376f641690f0c96945a07da
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Jul 9 04:51:09 2013 +0300

    MedHUDs and virus2.

commit 01f2c528b73915e15636e07fd33bb5039227a426
Merge: 9dec8e3 df90824
Author: Mloc <colmohici@gmail.com>
Date:   Mon Jul 8 16:12:59 2013 -0700

    Merge pull request #3269 from Spamcat/bef

    more pulse shit

commit 75c8f6d76a254788214f2af701e3a4c12ebcd2ba
Merge: 31fc095 b653f13
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Jul 8 23:28:22 2013 +0100

    Merge branch 'BEF-staging'

commit b653f132a982b7eacd5670b9d4a0636f96f7daaa
Merge: e5f8a18 ec15ae6
Author: Mloc <colmohici@gmail.com>
Date:   Mon Jul 8 15:14:36 2013 -0700

    Merge pull request #3270 from Jamini/BEF-staging

    As per Mloc, reverting old medbay.

commit ec15ae67b054a9cc23674f6e7f2a3fb79ff0f11d
Author: Jamini <mobiousjami@gmail.com>
Date:   Mon Jul 8 18:11:10 2013 -0400

    As per Mloc, reverting old medbay.
    Readded some flashlight seeding.
    Rejiggered engineering's layout a little
    Fixed missing blast doors
    Added an empty console in the monitoring room
    Moved atmos consoles in the monitor room so they are all reachable.
    Placed the engine and CE's office on the engine grid, not the main grid.
    Tested and works, should be ready to merge.

    Signed-off-by: Jamini <mobiousjami@gmail.com>

commit df90824d60b94186d5897f51d0a1c5839eb716c9
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 8 23:25:13 2013 +0400

    Whoa, 2 barsign.dm's? WTF?

commit c8eb9df6ac7545a00472b2a2551e64b0df3aa772
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 8 22:56:35 2013 +0400

    How do I grammar?

commit 0e153b72267e1b226f736461650a8dfd08abf9d0
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 8 22:37:54 2013 +0400

    Updated pulse checking on examine, optimized handle_pulse(), fixed some grammer.
    xoxo chinsky

commit a9c318751257a42d97e33ae9f3d945131a706264
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 7 15:18:08 2013 -0700

    Removes combat module on green and blue alert.

commit 78653b31756c4cafca881d9c3720f43bdc166cb7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 7 02:42:28 2013 -0700

    Removes visible tallies from votes.

commit e9210b0701eed1e8bac89ad4715929457e5c6693
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 7 02:28:34 2013 -0700

    Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting.

commit 31fc09567f1771e36e608d8930d1ac86d3852509
Merge: 37cb049 3ce4e2a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jul 6 14:59:13 2013 -0700

    Merge pull request #3264 from Mloc/master

    Small fixes

commit e5f8a18c8065ea10ab943965ea35c2871884f2ad
Merge: 6d0bc01 78653b3
Author: Mloc <colmohici@gmail.com>
Date:   Sat Jul 6 14:21:19 2013 -0700

    Merge pull request #3262 from Zuhayr/feature

    Replaces forcedrafting with voter drafting, removes visible tallies from votes.

commit 3ce4e2ad17eb0c8689a1dbccfc403540d56ef6c7
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sat Jul 6 22:20:13 2013 +0100

    Fixes #2559
    Changes Add-Note and Notes verb to be under the IC category, instead of OOC.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 94af89d0a28979ce7998d740805646fa12c0dc2d
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sat Jul 6 22:16:01 2013 +0100

    Fixes #2091
    Adds missing topic() code for page selection on player notes, properly alphabeticalizes.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 6d0bc013425fec9aabccfe01cfcc64758d1d14d8
Merge: 0a638a0 eba8477
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 09:08:19 2013 -0700

    Merge pull request #3261 from Jamini/BEF-staging

    Map fixes - 3247

commit eba84772dd4e173c31d7fe5892dbc0d4699916c1
Author: Jamini <mobiousjami@gmail.com>
Date:   Sat Jul 6 12:02:34 2013 -0400

    Map fixes (Atmos things in walls, sideways kitchen shutters), now with maptools

    Signed-off-by: Jamini <mobiousjami@gmail.com>

commit 0a638a0d087d5465cae462b498f58a02041a6f83
Merge: 857fe33 b846970
Author: Mloc <colmohici@gmail.com>
Date:   Sat Jul 6 07:14:04 2013 -0700

    Merge pull request #3260 from Zuhayr/feature

    Various fixes.

commit b84697055fee3722bd75fb6935d73b7b913a1ed7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 7 00:07:18 2013 -0700

    Embedded item string fix.

commit 587b2d8f240c9b440adcd54f131b08ecd7830a0c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jul 7 00:00:25 2013 -0700

    Cyborg sprite selection fix.

commit ad07f5e9e5e182c4b2df406df4f309c786960b62
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 23:53:59 2013 -0700

    Added procs for a custom item that were overlooked.

commit ee560d43da53fee600c335c73a85b1f01ce901a4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 23:53:24 2013 -0700

    Allowed ties to use mask sprites if equipped to the face, for accessories like lockets.

commit 4abd2f313bd0d74a8e581efdeef818e441d6ef7e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 23:42:06 2013 -0700

    Missing tie sprites for custom item.

commit 9a2ce351993bbbaa1eeac84b2e163330ac257080
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 21:53:11 2013 -0700

    Commenting out ninja mode, as it is broken.

commit 37cb049e451dcd90982a968a0641a1b17969f031
Merge: 144af0e 82c3e6a
Author: Mloc <colmohici@gmail.com>
Date:   Sat Jul 6 06:34:36 2013 -0700

    Merge pull request #3259 from Segrain/master

    Science bugfixes.

commit 82c3e6aa8c7540658502bb5f04b40780e438335e
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Jul 6 16:51:59 2013 +0300

    Fix for #3255.

commit 6804cf05184cd97b50d42a6872bf3f28afadea23
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Jul 6 16:50:01 2013 +0300

    Fix for #3254.

commit 857fe33388f9c2d51d2a9ba26bb6f667cc7d974d
Merge: 6f0ebc1 9a2ce35
Author: Mloc <colmohici@gmail.com>
Date:   Sat Jul 6 04:53:08 2013 -0700

    Merge pull request #3258 from Zuhayr/feature

    Commenting out ninja mode, as it is broken.

commit 9dec8e311c390587b451b7ce4950daf63142111f
Merge: bbeca82 a2d3edc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 00:30:09 2013 -0700

    Merge pull request #3252 from Segrain/bleeding-edge-freeze

    Examining cyborgs.

commit bbeca8280e9ebc04fa6ad0bce6bd8668a18f6e8d
Merge: 5f980c9 5f690e1
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jul 6 00:28:07 2013 -0700

    Merge pull request #3253 from Spamcat/signs

    Signs

commit 5f690e150d2babd6d00659b4a57140df56546d85
Author: Spamcat <spamcat@derpy.ru>
Date:   Sat Jul 6 02:48:06 2013 +0400

    Part 3: fixing shit

commit 63de302a09e8d50bb36b71486d56f5f7b3a4a33b
Author: Spamcat <spamcat@derpy.ru>
Date:   Sat Jul 6 01:14:02 2013 +0400

    Part 2: construction.

commit 0e4271f97c3bac71c6ff117636f92e04b7952b3a
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 18:20:10 2013 +0400

    Stage 1: deconstruction.

commit 87feed7e7bc52bc19ab0cf1f777dc07e60a4281e
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 17:55:38 2013 +0400

    Nice colours (and a minor bugfix)

commit 6f0ebc1bb5893c2290d94b5a5a779026a8ab46f3
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:03:32 2013 +0200

    changed how fire works

    -fire switched to release energy by burning fuel and generating heat from that
    - reorganzied the fire process in a saner manner

commit 7345b059a31fd7e2848c7428b1024da2acd25437
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:04:39 2013 +0200

    changed variable settings for the change in fire.dm

    added one new variable
    deleted three variables that are no longer used

commit a2d3edcaff4478771d4ee3c1626974d564df8a9b
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jul 5 21:56:25 2013 +0300

    More fixes.

commit ff912e132bbabef0253a29805b1f0429954309d4
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:06:34 2013 +0200

    readjusted composition of syndie bombs

    set them to produce a 1-2-5 explosion for the fire changes

commit f346d72383f6655aedd815d249495fb62487ec35
Merge: 0839316 fc2ab59
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jul 5 19:55:01 2013 +0100

    Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging

    Conflicts:
    	config/config.txt

commit 5f980c967b7bef1b86f9c1c9977253268e9edf84
Merge: ec92507 ba15e0f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 10:14:46 2013 -0700

    Merge pull request #3246 from LordBraindead/bleeding-edge-freeze

    rewrite of fire code - second attempt

commit 5abed5a5f694a184e782ceb52603fc453a3396d4
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jul 5 20:10:39 2013 +0300

    Modtype tweak.

commit ec92507260ce71751e4ec62ec6b77768e6a79df5
Merge: 4178422 d514be5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 07:03:13 2013 -0700

    Merge pull request #3251 from Ravensdale/master

    Custom sprite quickfix

commit d514be535c1990492f17b7ddf1d1d5cc4cca180c
Author: Ravensdale <Tri@rdinn.com>
Date:   Fri Jul 5 06:54:17 2013 -0700

    Remove mordeth221 from custom sprites list until his sprites are ready and in.

commit fc2ab59db7b1133bcbc68e5ac38f58a06fd014e6
Merge: 1514494 3498513
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jul 5 06:41:07 2013 -0700

    Merge pull request #3250 from Zuhayr/feature

    Fixes

commit 349851313e54deca9ab2386490f18ebf7b39121c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 23:34:44 2013 -0700

    Typo.

commit aeec95b350d89090fdde5b7e897f7bb794a3a38a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 23:31:27 2013 -0700

    Robot immortality fixes.

commit 8f596f5fc1bcc9af0ff35c82e7c1347746e1c98f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 22:32:37 2013 -0700

    Air alarm runtime fix.

commit 0cfaf8e70b51b46b15e82a3839ee0c7400bb6537
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 22:15:40 2013 -0700

    Minor string fix.

commit 60b9d0f8fcb8ffadc83e364c846c1c08e2e62d69
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 22:09:27 2013 -0700

    Compile fix.

commit a2249fb1dc4cb4d90db0b2705d93b395893d9671
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 22:01:09 2013 -0700

    Fixes yank out verb string issues.

commit b6699cbf9a6baf6208d09f302cc798811ddea135
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 21:57:51 2013 -0700

    Adds ammo to vox spawning with a crossbow.

commit 5dc40474ec53c566bd40e7430823ed7210721498
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 21:53:17 2013 -0700

    Removes vox randomness in appearance.

commit ea49fcf2a9a90b76c8ebff9421924dfacd1d3430
Merge: d04514e 1514494
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 21:47:09 2013 -0700

    Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12

commit d04514e9ad535ee6eab4f339b72326796ed1d1dd
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 17:04:08 2013 -0700

    Partial fix for #3087

commit 151449447a1abde4ffb900e452b1d97811d5362e
Merge: a1be7e4 f10c082
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 04:43:25 2013 -0700

    Merge pull request #3249 from CIB/bleeding-edge-freeze

    Fixed two bugs with robot components.

commit f10c08253f2a2aa33b0be1a9768dfa583018125d
Author: cib <cib123@lavabit.com>
Date:   Fri Jul 5 13:43:11 2013 +0200

    Fixed two bugs with robot components.

    1. They could be broken but still powered.
    2. Melee damage didn't work at all.

commit ba15e0f51517843d3f4d3dfdd877ced19e653362
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:06:34 2013 +0200

    readjusted composition of syndie bombs

    set them to produce a 1-2-5 explosion for the fire changes

commit 032530dfd7a1657dc9ef06d42fea82d34af5aab9
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:04:39 2013 +0200

    changed variable settings for the change in fire.dm

    added one new variable
    deleted three variables that are no longer used

commit 9cc31cdd21e9367508997016e23ecb3c6fde42e5
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Fri Jul 5 09:03:32 2013 +0200

    changed how fire works

    -fire switched to release energy by burning fuel and generating heat from that
    - reorganzied the fire process in a saner manner

commit a1be7e431c6d1838c92b782f3eb7587425c3346f
Merge: 1750f1e dba4eb5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:14:04 2013 -0700

    Merge pull request #3245 from Zuhayr/feature

    SkyMarshal's ZAS fixes from bef.

commit dba4eb5eb228a27d26bb77cc7243c41a1def46e4
Merge: 9ceb886 efd3d83
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jul 5 16:14:38 2013 -0700

    Merge branch 'airfixes' of https://www.github.com/SkyMarshal/Baystation12

commit 9ceb886d0c66d52eedbb1effd1b8c818409589cb
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:48:59 2013 -0700

    Fixes #2905

commit 15de508b4936684c154e97379155f2a1fa546311
Merge: a8ea0a3 144af0e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:29:48 2013 -0700

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit a8ea0a3fd478deabfeac88dca7a2a30317433ff0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:23:22 2013 -0700

    Bot shield not working against melee fix.

commit 1e7dc9667e00f8bcb1bfbb1971df6f54a0c76d8e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:22:55 2013 -0700

    Vox raider class distribution fix.

commit 1750f1e631b4f0851887081a0373af27b7c47ca9
Merge: a8e50ee 255408c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:09:44 2013 -0700

    Merge pull request #3244 from Ispil/Staging

    Fixes issue #3240. The order for visible_message is visible, person, aud...

commit 41784223e20aa1cf68f49b2eb4b5ee4c7b213c8f
Merge: 19b5f22 efd3d83
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:09:17 2013 -0700

    Merge pull request #3243 from SkyMarshal/airfixes

    Fixes some ZAS issues and improves air alarms some.

commit 19b5f2219d5512efaa8c40f02f2fe1cb18c09275
Merge: a90fd2b f7dc8f8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 23:08:11 2013 -0700

    Merge pull request #3241 from Spamcat/pulse

    Pulse

commit 255408c0261d5219bf8c9ddfebad888ccccb4cc6
Author: Ispil <HXxoriginxXH@hotmail.com>
Date:   Thu Jul 4 21:13:33 2013 -0700

    Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed.

commit efd3d83e78712939334a4ba99e9e6a19cb7cdf1d
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Jul 4 20:39:42 2013 -0700

    Reverts my firechanges, also air alarms now have a temperature regulation capacity.

commit dc3485ab2d8e96016d52b22d4f9b7003d9894cbc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 20:37:10 2013 -0700

    Indenting issue.

commit 0852a9f4b11dac95a0f624dfc7785decfefdd66d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 20:34:37 2013 -0700

    Partial fix for #3236

commit 2c6e0e2bcc02b505015fbcb71757878f54c14a29
Merge: 0140738 a90fd2b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 20:32:24 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 014073815717ed693528d69966c476742c61e696
Merge: 681fcb2 a2aa2e2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 20:26:55 2013 -0700

    Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12

commit 87f576fb6421cd40ec5ee007109408887154f30f
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Jul 4 20:22:19 2013 -0700

    ZAS and alarm fixes.

commit f7dc8f8c0a867f4d50749c5ed00fff1a223ca46e
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 04:50:18 2013 +0400

    derp

commit 1541b5dec8fe390be5096891d02e2584017cf2c1
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 04:44:54 2013 +0400

    Changelog.

commit 3a1ea41ff266447d73801d0439b295b1701d114e
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 04:39:57 2013 +0400

    Moar machinery.

commit 24eddd6eaaa61ec246efcdfbe99055134d550f56
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 04:12:41 2013 +0400

    Now 100% more machinery!

commit 6e61fe391480c4bb37837d18c2d56b2535c16554
Author: Spamcat <spamcat@derpy.ru>
Date:   Fri Jul 5 03:11:50 2013 +0400

    Initial pulse code. WIP

commit 681fcb28819a49e12ac1277d45f54188a9a8af25
Merge: db650d3 b4695d3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 15:26:06 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit db650d3757a805949f0136560185117694c4b59e
Merge: 969cb82 907d47e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 14:39:46 2013 -0700

    Config merge.

commit a8e50ee15a3dc2cf59c6f9b0e1feed5f65b55b86
Merge: a2aa2e2 9ceb886
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jul 4 09:52:24 2013 -0700

    Merge pull request #3238 from Zuhayr/feature

    Fixes from master/bef for staging.

commit 08393161c0a3f80181f19385e55d14812d674d05
Merge: a2aa2e2 144af0e
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Thu Jul 4 13:08:28 2013 +0100

    Merge branch 'master' into BEF-staging

    Conflicts:
    	config/config.txt

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 144af0edad94232fd5f8b6db1f3a50b2c7f1bafe
Merge: 907d47e 4c1bb07
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 05:01:13 2013 -0700

    Merge pull request #3237 from Ispil/master

    Fixes issue #2872, partially. Carp are now smashed by shuttles if they d...

commit 4c1bb073ff970b76ce751ddfef8a1eb958de5ec2
Author: Ispil <HXxoriginxXH@hotmail.com>
Date:   Thu Jul 4 04:55:24 2013 -0700

    Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.

commit a2aa2e25fa0654c354dce9d60e0fd9f42deb3152
Merge: 5b8dadf 0eb1b2d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 02:53:54 2013 -0700

    Merge pull request #3235 from CIB/bleeding-edge-freeze

    Implemented updatehealth() for robots

commit 0eb1b2d12cb516a9fc25c5f1b0b90e1f0b16b24c
Author: cib <cib123@lavabit.com>
Date:   Thu Jul 4 09:46:47 2013 +0200

    Implemented updatehealth() for robots

    Fixes a bug of them never dying.

commit a90fd2b4bb8d63d42facbe5a10594e83fb8a8392
Merge: b4695d3 8c6c03c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jul 4 00:36:51 2013 -0700

    Merge pull request #3233 from Ispil/Bleeding-Edge-Freeze

    Removes the ability to create anything HONK-related in the mech fabricat...

commit 8c6c03c9d669a88a0635b0dba1789eb8376a3b18
Author: Ispil <HXxoriginxXH@hotmail.com>
Date:   Thu Jul 4 00:28:40 2013 -0700

    Removes the ability to create anything HONK-related in the mech fabricator. Also removes the ability to add bananium, due to it thus being pointless to add due to the one thing it can build being removed. Note that everything is commented out, not deleted.

commit b4695d3d7450c5cf465be22565934aa692e44a67
Merge: 969cb82 34cd183
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 3 22:21:15 2013 -0700

    Merge pull request #3232 from Ravensdale/master

    Custom synthetic sprites and minor bugfixes

commit 34cd183d227dd48711cea4630c7e33bda5040ade
Author: Ravensdale <Tri@rdinn.com>
Date:   Wed Jul 3 21:54:39 2013 -0700

    blrg... didn't update my ai code before commiting, should be fixt

commit 9aedfa8b237cb49457cbca6fe52958736ab77709
Author: Ravensdale <Tri@rdinn.com>
Date:   Wed Jul 3 21:24:25 2013 -0700

    Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.

    Feature: Introduces and adjusts code for cyborg and AI custom sprites

    Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.

commit 907d47e8aab2716f7d17645f777726897240caa3
Author: Mloc <colmohici@gmail.com>
Date:   Wed Jul 3 15:45:24 2013 +0100

    Made ircbot_message.py use a password.

commit c4bc5ca06ea464917f526b9ed682604ef0ff50d9
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Wed Jul 3 12:04:37 2013 +0100

    you saw /nothing/.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 969cb820a0d9b74cab038c8cdf4407af5bdac489
Merge: 9a175c7 d14c2a5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jul 3 01:52:44 2013 -0700

    Merge pull request #3229 from Segrain/bleeding-edge-freeze

    Records access for cyborgs.

commit 46e31d5c21b8e3f74290db848309710f567b7f09
Merge: 12a79e4 cf4bd39
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jul 3 00:18:14 2013 -0700

    Merge pull request #3227 from Mloc/ahelp

    Updated the linkage between the NanoTrasen IRC bot and the server.

commit 9a175c7733e94e3db9b13647385a106f9d502c08
Merge: 2fda293 88791ee
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jul 3 00:17:58 2013 -0700

    Merge pull request #3228 from Ispil/Bleeding-Edge-Freeze

    Actually rectifies issue #3182, by making the activity list be based on ...

commit d14c2a515c892cfd57c085b4dbc78fe307966391
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jul 3 06:16:59 2013 +0300

    Quickfix.

commit 66265e2689b5e5fc25f5f1d96b55fab38f144e34
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jul 3 05:55:18 2013 +0300

    Recordskeeping update.

commit 88791eec5c0cae8b42e65e69b4d4fcafd2ceceaf
Author: Ispil <HXxoriginxXH@hotmail.com>
Date:   Tue Jul 2 19:14:10 2013 -0700

    Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code.

commit 3e945674b0cfdf0c527180b5380ad3968029bd0e
Author: Ispil <HXxoriginxXH@hotmail.com>
Date:   Tue Jul 2 16:14:06 2013 -0700

    Actually rectifies issue #3182, by making the activity list be based on the physical status (p_stat) in the records instead of an automated activity checker.

commit cf4bd39f6e025757da4a019d8c3fcdff76d3ce5d
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Jul 2 23:41:40 2013 +0100

    Updated the linkage between the NanoTrasen IRC bot and the server.
    - Server will now send adminhelps to the admin channel, with information if there is no admins online.
    - Server will inform the admin channel if the last admin online logs out.
    - When a round ends, the server will alert the main channel, supplying some statistics.
    Additionally, laid the groundwork for an external scripts system.
    This is fully configurable/togglable in the config.txt file.

    Signed-off-by: Mloc-Argent <colmohici@gmail.com>

commit 5b8dadf05ec00cfc53fae2152e701a048a8ac315
Merge: 0a53635 2fda293
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 2 08:24:51 2013 -0700

    Merge pull request #3226 from Baystation12/bleeding-edge-freeze

    Bleeding edge freeze

commit 2fda29387329fe6957b81bfc90406bc9bba35127
Merge: 967e7e6 cf4248b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jul 1 09:07:48 2013 -0700

    Merge pull request #3223 from Zuhayr/feature

    Combat cyborg module shields and mobility.

commit cf4248b9c93bddea45c3e75c07d2fa70d92c379c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jul 2 01:39:22 2013 -0700

    Combat cyborg module shields and mobility.

commit e3696a13e94947536b219ea9d65841ea66571362
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:51:03 2013 -0700

    Redundancy fix.

commit 3a12ed856e875cda60a929ef67046a151e57026f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:31:41 2013 -0700

    I hate the dme sometimes.

commit 3fb62273f73f6231c54f33ac8c7e90be8973719f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:21:49 2013 -0700

    Custom item.

commit c94686d5aa5e8e014d6aa205e03b5725a5b19e82
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:21:09 2013 -0700

    Ninja compile fix.

commit a332bd86d228af9e14165d5b0da34d5dda687d8c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:10:26 2013 -0700

    Fixes #3209

commit fe4629734e42331aff722ec941da11488df9e96c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 19:09:56 2013 -0700

    Fixes #3210

commit f30baff68f36b4294b72200b75cfbb2a42ff174e
Merge: 45da864 4a31613
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 18:36:06 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 45da8647981b49e30f5c39a2c286fd77ccf810db
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 10:15:53 2013 -0700

    Two more custom items.

commit cfecf42ee45e4004d01e4d5612cfee069747ebb0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 09:34:37 2013 -0700

    More custom items.

commit 967e7e632c309c65122d468f9cdfd524e9da7f90
Merge: 2a10d6e d023639
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jul 1 09:04:10 2013 -0700

    Merge pull request #3224 from Spamcat/loops

    No more world loops

commit d0236394ef1f39b93bcc7a26dbb9b29f4737c021
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 1 20:02:42 2013 +0400

    Client, mind, big difference...

commit 8b7fcaa11eba0196399d5ecca192bbba05503fac
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 08:52:00 2013 -0700

    Several custom items.

commit c79d58159bd7b38ed0c790191469071f84ee31db
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 1 19:50:06 2013 +0400

    whoops

commit 11e27c599905d580ca6bd992a63cc343dccfd6b9
Merge: 10ee1fb 2a10d6e
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 1 19:49:29 2013 +0400

    Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

    Conflicts:
    	code/game/gamemodes/objective.dm

commit 10ee1fbcfee03b9c42ec5230aced3d67a86c9300
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Jul 1 19:43:56 2013 +0400

    World loops 2: Electric Boogaloo.

commit 06df725be7ba7c8662fca86e556b98b09e1192db
Merge: 4428185 59f4717
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 08:22:25 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 442818591bd04586adeb152e90ce657298805390
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 07:32:42 2013 -0700

    Susan's custom items, committing on her behalf.

commit 50f94ddd935d50107cd1dd1383173d852684572f
Merge: da884f4 2a10d6e
Author: comma <krauchinsky@gmail.com>
Date:   Mon Jul 1 17:33:24 2013 +0400

    Merge branch 'bleeding-edge-freeze' into viro

commit da884f4ddc282cfbee2c9dc7151b000793530e18
Merge: 1b9d6f6 c9f6894
Author: comma <krauchinsky@gmail.com>
Date:   Mon Jul 1 17:23:09 2013 +0400

    Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro

commit 1b9d6f67e2006bffcb46bcf9cc30631cea032eba
Author: comma <krauchinsky@gmail.com>
Date:   Mon Jul 1 17:22:20 2013 +0400

    Made mutation change virus ID.

commit 5d9a3f12a1383ef530ecb245bb5631bf4906d7be
Author: comma <krauchinsky@gmail.com>
Date:   Mon Jul 1 17:08:21 2013 +0400

    Fixed humans being lukewarmblooded. Now only severe temperature differences will affect internal body temperature, so it will revert back to normal after a bit.

commit 05142eac35b72893eb0a79afc2d69328249a5924
Author: comma <krauchinsky@gmail.com>
Date:   Mon Jul 1 15:14:30 2013 +0400

    Fixed formatting issue.
    Editing name and description works now.

commit 0a5363515ad014a34303537615b2f5d5f8d6e3db
Merge: 00e4e01 2a10d6e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 03:00:03 2013 -0700

    Merge pull request #3221 from Baystation12/bleeding-edge-freeze

    Bleeding edge freeze

commit 2a10d6e5e1de4aa86d7405a1384806cf8280c3f0
Merge: f228d77 e3696a1
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jul 1 02:57:20 2013 -0700

    Merge pull request #3220 from Zuhayr/feature

    Fixes/more items.

commit f228d77e3bf3ad4a12e2300e9935d4be9bf317f0
Merge: 4a31613 1e59da2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 01:41:10 2013 -0700

    Merge pull request #3219 from fauxki/bleeding-edge-freeze

    BEF - Map Edit - Prison wing.

commit 4a31613309edb9664a02caba3caf2d1995d81472
Merge: 5dac228 99a317c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jul 1 01:31:04 2013 -0700

    Merge pull request #3177 from Whitellama/bleeding-edge-freeze

    Space Ninja Gamemode Implementation

commit 1e59da289f11cf1906b586a3968ba5193696eba7
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sun Jun 30 21:34:39 2013 -0700

    BEF - Map Edit
    - Adds supplies to the permabrig so prisoners can eat without using their ID.

commit 99a317cf079f3b72dd974c5293531b294cf3f8c5
Author: Whitellama <travis.whitellama@yahoo.com>
Date:   Sun Jun 30 20:08:46 2013 -0700

    Removed debug outputs

commit 6d8654eb7a8d432ca9a7a96428ad6735f451116e
Merge: e49a80d 5dac228
Author: Whitellama <travis.whitellama@yahoo.com>
Date:   Sun Jun 30 20:02:36 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

    Conflicts:
    	html/changelog.html

commit 5dac22883c514e951ec4da73759db19b2349233c
Merge: 186fe98 cfecf42
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Sun Jun 30 16:36:45 2013 -0700

    Merge pull request #3218 from Zuhayr/feature

    More custom items.

commit 186fe9897303500797391147f379eba1392394da
Merge: 59f4717 8b7fcaa
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Sun Jun 30 15:56:07 2013 -0700

    Merge pull request #3217 from Zuhayr/feature

    Custom items.

commit 59f4717096ff34562b4512749f7761282b1dd33d
Merge: aecad80 2661f8e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 30 10:04:29 2013 -0700

    Merge pull request #3211 from misterbook/bleeding-edge-freeze

    Pulling the teeth from bees, lowering halloss regen

commit aecad80fb179fa2e6cb473363f58b6e3d586e477
Merge: 04e4318 e29b078
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 30 10:01:43 2013 -0700

    Merge pull request #3216 from meyar/bleeding-edge-freeze

    Fixes a few ERT mapping errors

commit 04e43183049f5a80494ae34498d1f01c482defc5
Merge: 3ce810d 19680cb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 30 10:01:16 2013 -0700

    Merge pull request #3206 from Zuhayr/feature

    Cyborg cleanup, fix.

commit 19680cb2ba0ce1e9be2d3b836b4cf224e99397f0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jun 30 05:15:33 2013 -0700

    Compile fix.

commit e29b078dbb1228509212c061360bf00713c5f601
Author: meyar <grimreaper219@hotmail.com>
Date:   Sun Jun 30 08:10:56 2013 -0400

    Fixes a few ERT mapping errors

    Fixes a few more broken door sprites (Srsly, dafuq)

commit 3ce810daad0da287fdbeede9f49bf018f0ba528f
Merge: 729b01f c9e61fe
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 29 23:42:37 2013 -0700

    Merge pull request #3214 from Vetinarix/bleeding-edge-freeze

    Medical Tweaks

commit b33e91fbb137ddb89088074e4658de01e7894db7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 22:14:43 2013 -0700

    Cleaned up a lot of the module selection code, added Combat module.

commit c9e61feadb1a9727a867efe6562a7171e56848e1
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Jun 30 14:37:38 2013 +1000

    Medical Tweaks

commit bd864f6dc0f6e607a5c4163294968731504d7739
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 21:12:41 2013 -0700

    Fixes #3204

commit 2661f8e8ea7595ee036931a6c81a14816e6b5d2d
Merge: b9fb353 729b01f
Author: MisterBook <MisterBook@FakeAccount.Fake>
Date:   Sat Jun 29 23:05:56 2013 -0500

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

commit b9fb3538b14fb7491611c69eb249a79c73470a88
Author: MisterBook <MisterBook@FakeAccount.Fake>
Date:   Sat Jun 29 23:05:06 2013 -0500

    Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.

    Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.

commit c10137a118de7c2f426b69df787aba1e2d5e8d51
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 19:08:41 2013 -0700

    Fixes #3184

commit 5b5dcb848075d61f69b318a3ffeda4d53f7730e1
Merge: 6fc787f 681f34a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 18:11:39 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 6fc787ff7345337389d21c2d504b64d67ea25c98
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 18:09:35 2013 -0700

    Fixes #3201

commit e87348dd8d1e95f75e1d08a6a67c1d3e2331e5f0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 17:56:38 2013 -0700

    Quickfix for #3194

commit 60eeccd2ed44b2508c3a8f23e21ddbf119fbe195
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 17:27:46 2013 -0700

    Fixes #3198

commit 3192323c19fbe64e2f47e3cff6b4ed98d3655155
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 16:57:08 2013 -0700

    Fixes #3200

commit 729b01f193fd28538788a3038a036748397d5ca5
Merge: 3c79ef2 a928f4d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 14:45:51 2013 -0700

    Merge pull request #3208 from zekesulastin/language-whitelist

    Allow for selection of one secondary language based on alienwhitelist.txt

commit 3c79ef20dd3809176de37272a4a8e162b2cd898d
Merge: ce0d3ea 00db60f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 14:43:35 2013 -0700

    Merge pull request #3207 from jack-fractal/bleeding-edge-freeze

    Bodybag -> Cryobag (tiny re-factoring)

commit a928f4d5ec8e363b24bfa156469b8492b4c9c51b
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Sat Jun 29 17:33:44 2013 -0400

    New players spawn with selected secondary language

    As with the setup, this checks in alienwhitelist.txt for entries of
    the form ckey - Language_Species, with Soghun for Unathi.

commit 3c6c9ed30454717abc06407a03938c7bc011953a
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Sat Jun 29 17:32:48 2013 -0400

    Secondary language is saved in the char saves

    Also increments the max save version; previous saves are rendered
    compatible via sanity check assuming no secondary language.

commit 9a8b9bcc6063da9ba72c374decc8a421fc550b71
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Sat Jun 29 17:31:21 2013 -0400

    Added secondary language to char setup

    This allows for one secondary language to be selected per character.
    Whitelisting is done in alienwhitelist.txt via ckey; language options
    are specified by ckey - Language_Species, with Soghun for Unathi as with
    the normal whitelist.

commit 00db60fa954f129938edac6bc625faecc4e11470
Author: jack-fractal <halloweenincorporated@gmail.com>
Date:   Sat Jun 29 16:49:48 2013 -0400

    This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).
    This also removes redundant defines from cryobag class.

commit 0e1829794eb6178013418c694ec8f3b0a01179f6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 29 19:08:31 2013 +0400

    Started on editing capability for virus DB.
    Some weird issues with it, like first <a> making stuff invisible.
    Committing before Armageddon.

commit ce0d3ea68f938a68b4fca8d2964941917ea92ef1
Merge: 60b33af c10137a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 29 02:17:01 2013 -0700

    Merge pull request #3205 from Zuhayr/feature

    Fixes #3184

commit 60b33af71f02418b498fbdfacac63d9add063214
Merge: 681f34a 5b5dcb8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 29 01:17:53 2013 -0700

    Merge pull request #3203 from Zuhayr/feature

    Bugs.

commit 681f34a8c692af7e1fa09c369f7b0e1ccec8894d
Merge: 9b9cf6d d6e1933
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jun 29 00:16:45 2013 -0700

    Merge pull request #3202 from meyar/bleeding-edge-freeze

    Fixes a few shutters. Root cause unknown.

commit d6e19335e6f549d81904156e78fe8909f9f58f44
Author: meyar <grimreaper219@hotmail.com>
Date:   Sat Jun 29 03:05:50 2013 -0400

    Fixes a few shutters. Root cause unknown.

commit 9b9cf6dfe07be8b1720b98b28d2625124f4d286f
Merge: aae0769 6b5bd3c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 23:06:26 2013 -0700

    Merge pull request #3190 from Kilakk/bleeding-edge-freeze

    Fixes #3188 - Mods can now see deadchat

commit aae0769cc77fcf6b56ce9742322392a7f16364cf
Merge: 11937b6 df93d2e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 23:05:51 2013 -0700

    Merge pull request #3196 from Vetinarix/bleeding-edge-freeze

    Medbay Tweaks

commit df93d2eac006610564bb22ffcdbe4fa3828ec773
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Jun 29 14:37:01 2013 +1000

    Medbay Tweaks

    Edits to Chem, Virology and Reception. Replaced some lights, added some
    more windows about the Medbay, reticulated splines.

commit 8bd7d77916f725b8caf3fb8283cd51627365ca49
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Jun 28 23:57:16 2013 +0400

    Medical record viral DB now should list scanned virus2 stamms.
    Fixed runtime in analyzer DB uploading.
    Fixed derp in get_info() proc for viri

commit 051edc22275dc63b34905664ef81208c25711485
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Jun 28 15:43:58 2013 +0400

    Started implementing of ViroDB.
    -Analyzers now add info about viruses they scan to global list.
    -Health analyzers will only find known viruses.

commit 00e4e01e0ce6e9c10d71eb7ed87f9012cf5ec079
Merge: f868a30 11937b6
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jun 28 11:37:39 2013 +0100

    Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bef

commit f868a30ef8c6e7f7ebcd1356a799188d327abd61
Merge: 12a79e4 aa21bd7
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jun 28 11:36:43 2013 +0100

    Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into staging

commit 11937b6b8c94ddab778362ea182b9b8407d75c4a
Merge: 7a7000a fa1a95b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Jun 28 00:12:38 2013 -0700

    Merge pull request #3192 from Zuhayr/feature

    Whitellama's changelog merge.

commit fa1a95b5144ab44758322475adb1063a2cebd294
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 17:05:18 2013 -0700

    I hate the changelog.

commit e052ef5a22e5f10c86be4c4ba0d671ba8e68c3a2
Author: Whitellama <Travis.Whitellama@yahoo.com>
Date:   Wed Jun 26 17:30:32 2013 -0700

    Whitellama's changelog merge.

commit 7a7000a041ca2e735be6b12202b675fe3502ea5a
Merge: 1d03732 7a6a5f8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 23:50:33 2013 -0700

    Merge pull request #3186 from meyar/bleeding-edge-freeze

    Re-adds the barman shotgun permit Fixes a security maintenance area issue.

commit 7a6a5f8386f968bae27e2ab90914099338972667
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri Jun 28 02:41:43 2013 -0400

    Fixin' map shit.

commit c82226b62709dffe4f0b2907ba3a46dea3dc3121
Merge: a458128 1d03732
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri Jun 28 02:31:45 2013 -0400

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit a458128d431e206ba75c9ffc2bbf381c49eb9325
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri Jun 28 02:31:10 2013 -0400

    Revert

commit 1d03732f404206c5a23d36e5bc278754e889e642
Merge: 0f9384d 1d28bb7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jun 27 23:00:12 2013 -0700

    Merge pull request #3180 from Zuhayr/feature

    Hardsuit/medication nerf.

commit 1d28bb7cb37baf04eb4c03012ff63d2d4b9a047b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 15:55:41 2013 -0700

    Message tweaks.

commit c7bbc3c9b376ef4a8cae96447cfa57277f34ffed
Merge: 665bdd1 12a79e4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 15:53:50 2013 -0700

    Changelog.

commit 665bdd16ab065df0d5ea82b3490a3096973b763a
Merge: 58bf2d2 0f9384d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jun 28 15:50:07 2013 -0700

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 0f9384db8eb12118009b3aab607768f9967d4d2f
Merge: d28d90c 4bcae3a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 22:47:06 2013 -0700

    Merge pull request #3189 from Segrain/bleeding-edge-freeze

    Examine() tweak.

commit 6b5bd3ca8de1fcd4495b10a58f5a5626fea14f96
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Thu Jun 27 23:45:17 2013 -0400

    Fixes #3188 - Mods can now see deadchat

    Mods can now see deadchat regardless of whether they're ghosted or not.
    Works with the deadchat toggle.

commit 58bf2d218cb8cc7c7c79747ebc2e46ea9e600ba4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 18:02:10 2013 -0700

    Bandages and ointment cannot be used through space suits.

commit f5abc3e041099e07a2892a5746964b848aa8388c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 17:59:37 2013 -0700

    Syringes now have an increased delay when injecting through a hardsuit.

commit 4bcae3a06bef6513420348529360e708d243c061
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jun 28 03:33:06 2013 +0300

    Examine() update.

commit 12a79e4ade6cf2a0746df30df32c676212cd5258
Merge: 5d912b7 6f207a3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jun 27 16:12:17 2013 -0700

    Merge pull request #3181 from Zuhayr/master

    Fixes solar control and SMES for borgs.

commit 6f207a3a14b3aa0d9132cbde4fe1e85bd1bd5f67
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 18:09:48 2013 -0700

    Fixes #2424

commit 2409c67be6280b08a22e6b62132ab7e7d92826b4
Author: meyar <grimreaper219@hotmail.com>
Date:   Thu Jun 27 07:56:38 2013 -0400

    Re-adds the barman shotgun permit
    Fixes a security maintenance area issue.

commit d28d90c1f019710021697591d86fb07af1515dc8
Merge: 66bbebc 29930c8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 04:04:17 2013 -0700

    Merge pull request #3185 from Vetinarix/bleeding-edge-freeze

    Medbay Updates/Tweaks/Atmos Fixes

commit 5d912b70b28a326862516a5a32eb1bcc87a05ebc
Merge: 292929c 31e4487
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 04:03:58 2013 -0700

    Merge pull request #3183 from Segrain/master

    ID cards bugfix.

commit 31e44872292ff6f70492a01c6c41459f17219c50
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jun 27 14:10:05 2013 +0300

    Fix for #2430.

commit 29930c8257a7330b7f8931152067ba53e8cdd824
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 20:22:11 2013 +1000

    Psych Tweak

commit 3a688f4ba73e969a7926e69a71d71b2b39cb6f88
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 20:17:49 2013 +1000

    More medical tweaks.

    It ends here.

commit 4af4970f92511388c36e187c096d0ac6606a18fa
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 19:42:17 2013 +1000

    Tweaks gonna tweak.

    Moar.

commit b28f3b818ffca2f755307c3de5d2bd66d0e725bc
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 19:32:11 2013 +1000

    Generic tweaks, Medbay

    CMO Office, corridor alarms.

commit 7e9fc3fd731a810f55e4aeffcfdd32fa6c3762f2
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 19:09:30 2013 +1000

    Medbay Cam Network

    Adds camera for CMO observation of labs.

commit e15219d6f3b878383b97d9e6855bcc368972730c
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Jun 27 18:58:05 2013 +1000

    Medbay Atmos Fixes + Tweaks

    More atmos fixes, inc. added more vents and scrubbers (so that isolated
    areas do not over/de-pressurize) and other tid bits (intercoms, etc)

commit 66bbebc378ff1bea5c536b021e7fa926c228871d
Merge: 5414ceb 20bb582
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 26 23:43:13 2013 -0700

    Merge pull request #3178 from Jamini/bleeding-edge-freeze

    Map tweaks

commit 5414ceb7e75224975f619e17ff5c0a37b7813eca
Merge: 4c2ab51 cb7753f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 26 23:42:48 2013 -0700

    Merge pull request #3179 from meyar/bleeding-edge-freeze

    Bleeding edge freeze

commit 4c2ab51b03aa025273fb125f58b099d82c2db811
Merge: c98671a 64dfca7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 26 23:42:02 2013 -0700

    Merge pull request #3175 from Zuhayr/feature

    Fixes from master, adds clotting to wounds.

commit 64dfca731bb643bce43f0afd78958e5ddbc9d52d
Merge: d899504 292929c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 09:01:01 2013 -0700

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit d89950487a95a65bdc6ebb7ddf0120cbbd2857c3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 08:47:15 2013 -0700

    Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.

commit 304be1fe417abbe48d94052051213bbf6e237f8b
Merge: 5dbb0bc 31990dd
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 07:27:38 2013 -0700

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit 5dbb0bcb879fb099f974e2512191a0a99e203925
Merge: c98671a f1e3621
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 06:41:47 2013 -0700

    Changelog.

commit cb7753f45f30e4edf7545086a2e2d0a245305675
Author: meyar <grimreaper219@hotmail.com>
Date:   Thu Jun 27 02:12:32 2013 -0400

    Fixes a few issues

commit c1fe654d694a01098c68ad2c5e09f0af74e97110
Merge: b62100e c98671a
Author: meyar <grimreaper219@hotmail.com>
Date:   Thu Jun 27 01:26:04 2013 -0400

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 20bb5820906f39d5e221a3fca851c8e3513cee22
Author: Jamini <mobiousjami@gmail.com>
Date:   Wed Jun 26 21:09:16 2013 -0400

    Map tweaks

    Multiple bugfixes, adjustments to engineering, moved engineering pod, changed the training room to a portables storage room, changed the construction area to a training room, more bugfixes, fixed up a lot of pipes, fixed dozens of scrubbers/vents that were set off or set to the wrong type of vent, more fixes, fixed a crooked AI door, added a few airlocks that were lost with the medical change, more fixes, rearranged the engine room a bit, added a sing observation camera, more fixes.

    Signed-off-by: Jamini <mobiousjami@gmail.com>

commit 292929caa1a7f2bf6f21d2d8a370bac68a18331c
Merge: 31990dd fa0e146
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jun 26 15:48:02 2013 -0700

    Merge pull request #3176 from Segrain/master

    Rejuvenate bugfix.

commit fa0e14652a29996f4c62cadf33c598b97f140436
Author: Segrain <dldobrolubov@gmail.com>
Date:   Thu Jun 27 02:20:19 2013 +0300

    Revive bugfix.

commit 31990dd0a74d41e93627eee8f6e090f04e62a3ea
Merge: f1e3621 6d46297
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 26 14:24:54 2013 -0700

    Merge pull request #3173 from Zuhayr/master

    Fixes meteor storm secret, fixes wall recharger sprites.

commit 6d46297757b887b7c07ef3c86850563c1ad842d8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 07:17:55 2013 -0700

    Fixes #2947

commit b41e92dc01b54ce5e631d8e5b7a27482e350634c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 07:01:42 2013 -0700

    Fixes #2870

commit 8eec1d5379b707549b89d24899526d9d8dc9763d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 06:30:17 2013 -0700

    Fixes #3008

commit b270c6060df4b0ea45739ce57f1720344d2ec866
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 06:22:01 2013 -0700

    Fixes #3025

commit 6d7669811615bc62f237b5963d5c12228d3cd066
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 02:33:57 2013 -0700

    Organ regeneration nerf.

commit 333e59190c84d945966b44a76907379684628b4a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jun 27 02:09:36 2013 -0700

    Added minimum damage for cutting wounds to bleed visibly.

commit f1e3621ec6228115a8bf0fc1c12995064b2e176f
Merge: 5068fe3 8eec1d5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 26 13:29:43 2013 -0700

    Merge pull request #3171 from Zuhayr/master

    Bleeding minimum-cutting-damage tweak, runtime fixes.

commit 5068fe33b99e199fc35e3dfac99b275ce3e60210
Merge: 31f8035 d5620f9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jun 26 05:59:50 2013 -0700

    Merge pull request #3169 from Segrain/master

    Autopsy bugfix.

commit d5620f9bb074db72d94a8d3e4dc34df38c624013
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jun 26 16:18:08 2013 +0300

    Changelog update.

commit a944cda68e4f30c763e2092713c63ab881c245a3
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jun 26 16:12:32 2013 +0300

    Autopsy fix.

commit 91ab2496818e9e3023b5680326d98d208c4476ca
Author: Segrain <dldobrolubov@gmail.com>
Date:   Wed Jun 26 16:11:10 2013 +0300

    Helper update.

commit b62100ea4bfaa8d0f6b809ef76bf6558dcd20d26
Author: meyar <grimreaper219@hotmail.com>
Date:   Tue Jun 25 07:32:04 2013 -0400

    Because sandbox is broken. And fuck sandbox.

commit b7c364dba3e07cf88fb30dfc30430983e3a1d890
Merge: 3fcdf85 a0e3fee
Author: meyar <grimreaper219@hotmail.com>
Date:   Tue Jun 25 07:31:17 2013 -0400

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

commit 3fcdf851f02cda74ebe4721d6f75619d40013079
Merge: 12daf1f 31f8035
Author: meyar <grimreaper219@hotmail.com>
Date:   Tue Jun 25 02:44:39 2013 -0400

    Merge branch 'master' of https://github.com/Baystation12/Baystation12

commit 9a62219a1fe1043021464647ffd1b7b3a09d1475
Merge: 299d1b9 3d65dff
Author: MisterBook <MisterBook@FakeAccount.Fake>
Date:   Mon Jun 24 13:02:47 2013 -0500

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

commit aa21bd7ed1f4cca2b60ce530611e9d8a3fa23789
Merge: 54b835f 00ba028
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 23 00:24:25 2013 -0700

    Merge pull request #3140 from Baystation12/bleeding-edge-freeze

    Bleeding edge freeze

commit 299d1b94d3c0f293f4d3924413c5b75e346dfd87
Merge: 5b06b76 173aee9
Author: MisterBook <MisterBook@FakeAccount.Fake>
Date:   Sat Jun 22 21:58:01 2013 -0500

    Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

commit 2a9be1a2aa7d6e36bd26a060f376ac0bbf059122
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 22 12:08:37 2013 +0400

    Commented out blood/virus food reaction, that was about tg virus system.

commit a4325d69eb1939ab43abd6fe0ce1613417e3bff4
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Jun 21 21:37:20 2013 +0400

    Fixes for runtimes and viruses staying in blood after curing.

commit 2b348eaa3eadf2d981cdf47a502058b10cb6bc45
Author: Spamcat <spamcat@derpy.ru>
Date:   Thu Jun 20 17:21:16 2013 +0400

    Phasing out world loops, pt 1

commit 2624abdaba285c7483c559cc525ce35d403ef12c
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed Jun 19 15:08:55 2013 +0400

    Secbelts now can hold melee weapons.

commit a3587dc81de5525c26cd2aac4bf18ec32a0e458c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 19 02:33:32 2013 +0400

    Adds new virology machine - centrifuge.
    Used for extracting virus samples or antibodies.
    Accepts only vials.

commit 960a22ee43dd56b0ad084eba9c4e124155e44f71
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jun 19 02:28:53 2013 +0400

    Changes way viruses are stored in mobs.
    Now it's an associative list:
    uniqueID - virus datum

    Updated most instances to match it.

commit cb7daa77a6170207ef3dcd69e74c0b4f7e1e034c
Merge: 898da9b 2ab02fa
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jun 18 14:55:59 2013 +0400

    Merge branch 'bleeding-edge-freeze' into viro

commit 5b06b76a108ab1add01c7103af7016b405ec81fa
Author: MisterBook <MisterBook@FakeAccount.Fake>
Date:   Sun Jun 16 19:05:10 2013 -0500

    Updates

commit 898da9b31077b47b59269a705e7f4fde3b6e0d3f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:31:42 2013 +0400

    Moved function of infecting blood samples with viruses to incubator from the cure machine.

commit 6f45ff68c76d66a01b87b4f4bfae69d7ff63f7cc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:30:47 2013 +0400

    Changes to effects:
    fixed indentation in some cases.
    added feedback message to disorientation effect.
    changed mucus virus transfer to proper proc

commit 5aa1170bd30cc93364f32c154350157b4eaf8e5d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:29:18 2013 +0400

    Changed isolator to be able to isolate any virus from sample.

commit 934a25a172b6073a3cb0f3a9786d24e57920fe99
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:27:00 2013 +0400

    Added antigen check to viri comparing proc.

commit fd13ff0d64d8cd48692848a9edb3462f8029b115
Merge: 5d7b62f ca4c386
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:22:15 2013 +0400

    Merge branch 'vials' into viro

commit ca4c3869b9fb2f5d5b2390f8a0d5595f58a3e672
Merge: f052d8d 71e47fc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 16 11:20:45 2013 +0400

    Merge branch 'bleeding-edge-freeze' into vials

commit f052d8d97275f2b749b3e0fd5000af17bf795820
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 15 22:13:31 2013 +0400

    Added boxes for vials. Usual and secure version(default to viro access)
    Changed vial lid sprite slightly.

commit a76b87635e39854d533993e0345acc6b88d1a1df
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 15 15:54:43 2013 +0400

    It only holds 15 units.

commit 5d7b62f32db270704a71a3583e45e70c8eaa1ecb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 18:31:11 2013 +0400

    gave virus slight chance to change antibodies they could be cured with.

commit d25c9723e11035ba1449051ee00afd7ae47ac987
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 18:19:35 2013 +0400

    Two new syndromes, ideas stolen from TG's advanced diseases:
    -Balding
    -Stimulant - generates hyperzine.

    Two more:
    -Longevity : heals small amount of damage and some broken bones when activated. When healed deals same amount of damage.
    -DNA degradation : deals tiny amount of clone damage

    Also made retrovirus deal clone damage as well.

commit 915c37f1b6ca1307bcb56f3aaa60c614b5ed50f2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 17:10:07 2013 +0400

    Two new syndromes:
    -Retrovirus : scrambles DNA.
    -Shutdown : limbs become unusable. Reversed when cured
    -Fragile Bones :

commit 5056e3a4fa0efbe3d360dfa77d4edb3e21c049bd
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 17:06:37 2013 +0400

    Added fever to the virus progress.

commit 300a73da71df570df73ad449a27ff3cc35f47b03
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 16:51:07 2013 +0400

    Should make unusable limbs treated as such.

commit e74f52f86bf8cdcba262171bb74e099e58b79d11
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 16:39:03 2013 +0400

    OCD commit, makes capitalizations uniform

commit 28c15adaa397be3e2dd833b3c09eb48977ed70d7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 16:30:22 2013 +0400

    Fixed runtime in blood transfer.
    Fixed cure machine producing virus blood wrong.
    Changes to existing syndromes:
    -Cough : now has chance to infect people around mob.
    -Telepathy : now should properly give powers to the mob.

    New syndromes:
    -Topographical Cretinism : confusing directions, much like drunk effect.
    -Blackout : short-time blindness

commit be8ca60280fac73bfae1436a8732e894b0e0b402
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 14:27:41 2013 +0400

    Changed how 'greater' effects are picked, now it's var-based, not type-based.
    That'll let 'greater' and 'lesser' viruses pick low-stage symptoms from same pool without duplicating them.
    Also sorted effect datums by stage in effect.dm.

commit 7a8a822a92941ecf06c84a0fa410986dc68fda67
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jun 9 13:31:16 2013 +0400

    Made it possible for mob to be infected with several viruses at once.

commit 5703b8089d683e70aed7d360783ef9c3d9dd1324
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 8 18:44:57 2013 +0400

    -Forgot to commit one file for previous iteration.
    -Fixed derp with analyser.

    Refactoring virus2, Part II - Viruses.
    -Removed obsolete curing/resistance methods.
    -Split base.dm into disease2.dm, effect.dm, helpers.dm.

commit 1820a227a14b606a0a4acf9e55feacb4c47b6c4a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 8 17:36:12 2013 +0400

    Virus2 Refactoring, Part I - Machinery.
    -Removed functions already defined in parent classes.
    -Replaced checks in Topic() with parent class ones.
    -Removed two unused files (there are duplicates in unused folder anyway)
    -Removed commented out lines, mostly pre-antibody curing code.
    -Shuffled code around for better readability (like antibody list)
    -Moved various devices and items defines to separate file.

commit 405dff19b8832bfa79c1d9eb6c3b69d1caa07acc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 8 13:00:37 2013 +0400

    Moved virus2 out of WIP folder.
    It's been finished years ago...
    Also removed Disease2 folder which is just older versions of same files.

commit 59834d2ed9832818a6972f3840e98ed44eab4e30
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jun 8 12:39:03 2013 +0400

    Added new reagent container - vial.
    basically 15u beaker.
Quickfix for the engineering pod being ripped apart when it reaches its destination.