Squashed commit of the following:

commit 82d4d3a49746b5ac846b9f5f4ccd3658427912e9
Merge: d96fc4a b83e0f2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Apr 7 02:20:55 2014 -0500

    Merge pull request #4712 from Jarcolr/kilo

    Fix for #4701 and immersion

commit d96fc4a05774b4af472c1067eda0e52d6cb9b3ae
Merge: 4ee7569 31f9354
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Apr 6 18:33:51 2014 -0700

    Merge pull request #4704 from Jarcolr/patch-1

    Fix for #4681

commit 4ee756985892b5fb45c25437e88085d500223d04
Merge: 5300508 c9a8572
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 6 22:12:08 2014 +0400

    Merge pull request #4694 from mwerezak/master

    Fixes #4689, #4680

commit 5300508fc22c705691d7d70a2470d791bd64e78b
Merge: 5b5c269 a3bf973
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 6 22:11:43 2014 +0400

    Merge pull request #4702 from Jarcolr/patch-2

    Kicking a grille does 2 less damage; fix for #4557

commit 5b5c269221b7283cf20a16328d3c7eb60f605669
Merge: 64160ea 5c73a7d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 6 22:06:42 2014 +0400

    Merge pull request #4713 from volas/master

    Fix for White UI icon

commit 5c73a7d3ae6e7b9626c1269d46528599571ee861
Author: volas <volas777@ya.ru>
Date:   Sun Apr 6 19:39:19 2014 +0400

    White UI icon fix

commit b83e0f2ad7ab0a02d3ee90fa5e6e76747f68354c
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sun Apr 6 13:24:44 2014 +0300

    Adds additional text to lighting

commit b6ee8a62b00bf57bf1a09245bd26840d943a93aa
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sun Apr 6 12:43:58 2014 +0300

    Fix for 4601 and immersion

    Premium Cigar now understands being lit,and the corn cob pipe/ cigars
    now no longer refuse being hit by fire.

commit 64160ea6c36a7a6e603cf3dc2986b11ee7b72462
Merge: 5933496 0b49fcd
Author: Asanadas <asanadas@hotmail.com>
Date:   Sun Apr 6 03:33:04 2014 -0400

    Merge pull request #4711 from Ccomp5950/viro_mapfix

    Map fix - Virology

commit 0b49fcd0a5c385a0dac891ae0884ffb8a0ebb4ec
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Apr 6 02:08:40 2014 -0500

    Mapfix - Viro/MedMaint not having area definitions

commit 5933496ad01701975c47af3d0814c5580d8f41a0
Merge: 772edff 925cb02
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Apr 6 00:16:42 2014 -0500

    Merge pull request #4696 from Jarcolr/epsilon

    Removes unfat sting from changeling evolution menu

commit 772edffad1fa560b613d233fb3e648854922f7c3
Merge: 1a3967e bec699b
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Apr 5 17:05:06 2014 -0700

    Merge pull request #4700 from Jarcolr/diction

    Spaghetti isn't called spagetti anymore

commit 1a3967ecb3a8bc913b72de18b6357109c3e9db1d
Merge: 766fc36 753a2ef
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Apr 5 17:02:16 2014 -0700

    Merge pull request #4691 from Ccomp5950/ventfix

    Code Effeciency Project:  Vent scrubbers have a bit more sanity.

commit 31f935413ed6c548d7838e4bbcc0fa1a145b7773
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sat Apr 5 23:27:07 2014 +0300

    Fix for #4681

    #nerftele2014

commit a3bf9733a234d147f34041cb830118f75d90e0a1
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sat Apr 5 19:15:41 2014 +0300

    Kicking a grille does 2 less damage; fix for #4557

    It will now take 10 hits to destroy it without using a weapon or tools.

    Take that,metagamers!

commit bec699bb7c78b772a2c776b83a74e4565c3e0782
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sat Apr 5 18:13:19 2014 +0300

    Spaghetti isn't called spagetti anymore

    Didn't change the code/vars/recipes; just fixed the Name line to the
    proper spelling.

commit 925cb02ef703c93a716408d0dcc9fe782b997297
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sat Apr 5 10:20:54 2014 +0300

    Removes useless unfat sting from evolution menu

    Also fixed a typo; but meh.

    No point in having to use points on something that has no use.

commit c9a857217af72138fbb0a8be4364b6759e37631e
Author: Mike <mwerezak@gmail.com>
Date:   Sat Apr 5 02:23:57 2014 -0400

    Fixes #4680

commit 920a08412b5588dc277fd871ac067bcc3979a2bc
Author: Mike <mwerezak@gmail.com>
Date:   Sat Apr 5 00:38:48 2014 -0400

    Fixes #4689

    Rods can't break reinforced windows.

commit 753a2ef08c6e53cceb39225a8bc8960dd3688c37
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Apr 4 13:21:47 2014 -0500

    Code Effeciency Project:  Vent scrubbers have a bit more sanity.

    No longer checking for 0.00000000000000000000000001 moles of toxins scrubers can only detect stuff worse then 0.001 moles.

    Have a nice day.

commit 766fc36902c737c9e6a4945a46a7c26e2d59eaf0
Merge: 78968de efba89d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Apr 4 01:12:23 2014 -0500

    Merge pull request #4684 from mwerezak/master

    Code cleanup regarding APCs

commit efba89daff42fe92776dbc007301f8e10059857d
Author: Mike <mwerezak@gmail.com>
Date:   Wed Apr 2 23:48:48 2014 -0400

    Corrected comments for CELLRATE and CHARGELEVEL

    Comments erroneously stated that a value of 0.002 would convert 1000
    watts to 20 charge per tick, when in reality 1000*0.002 = 2 not 20.
    Similarly for CHARGELEVEL.

commit 353941db7c602854de085d5459f323c13e76bac2
Author: Mike <mwerezak@gmail.com>
Date:   Wed Apr 2 23:46:54 2014 -0400

    APCs that are undersupplied now call cell.give()

    APCs that are undersupplied now call cell.give() instead of manipulating
    cell.charge directly, for better encapsulation.

commit 78968de207f197cd1f1fd55982673e578d82a9f8
Merge: 0bf6708 b33e9d0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Apr 1 13:39:11 2014 -0500

    Merge pull request #4674 from Jarcolr/diction

    Fixes #4621

commit b33e9d0b92b3f55027749f5d6f638d46c42730c0
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Tue Apr 1 17:36:36 2014 +0300

    Fixes #4621

    Shogun forgotten in time.

commit 0bf6708342ea4a55b59d0b7b8bb9b0c48de1331e
Merge: 2600771 6af132b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 1 18:17:22 2014 +0400

    Merge pull request #4666 from Ccomp5950/apc_fix

    APC bugfix after someone messed with mah areas!

commit 26007716e491ab0f6311014499f82ba9920c4427
Merge: ccf10f5 231ecb6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 1 16:23:18 2014 +0400

    Merge pull request #4660 from Jarcolr/patch-2

    Can no longer use fire extinguisher closet without hands

commit 6af132b83460589e082b55cd02c38ccb882678f1
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Apr 1 03:06:58 2014 -0500

    APC bugfix after someone messed with mah areas!

    This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
    and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
    not required but doing so either way.

    We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
    update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.

commit 231ecb68900c2dbbd41f6e39af16522e06f0de5c
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Mon Mar 31 21:13:26 2014 +0300

    Cannot wash your missing hands anymore

    M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.

commit ffd4afa43dabd9b167b1bbec4b71ee04d14a8cb4
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Mon Mar 31 18:48:57 2014 +0300

    Also fixes paperbin without hands

    Whee.

commit cf42e348f0026404a6e0833e2c3569e32781fb85
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Mon Mar 31 18:19:25 2014 +0300

    Can no longer use fire extinguisher closet without hands

    If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
    Cool,right?

commit ccf10f56db4bc4aa158204cb5aa3a560bab5faa2
Merge: c0484a5 caedff9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 31 15:01:55 2014 +0400

    Merge pull request #4656 from Jarcolr/master

    Fixes #4536

commit c0484a5b29eba0f73a7626e052116535972dd80b
Merge: 9227823 ddbe9dc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 31 15:01:38 2014 +0400

    Merge pull request #4658 from DJSnapshot/hotfix

    Map fixes

commit 9227823e2c25361679e9243ed493546392c284c4
Merge: 19db97f bf7684b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 31 14:57:43 2014 +0400

    Merge pull request #4654 from Ccomp5950/Buff_NarSie

    Lagsie no more, NarSie HUNGERS

commit 19db97f9e2d29f75ed89adf0aeebdcd034b3d832
Merge: 48b4313 12b5db4
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Mar 31 00:27:04 2014 -0700

    Merge pull request #4650 from Ccomp5950/damn_boulders

    Oversight, miners can now bump mine boulders just like the rock around them

commit 48b431332f6c450011f60f788e2907aaafd3df99
Merge: 8cb9733 5e04567
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Mar 31 00:25:54 2014 -0700

    Merge pull request #4646 from Ccomp5950/master

    Changelog update, added notes for previous merges.

commit 5e045674d10008ca437eb0f373ae958873aa7cb9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Mar 31 01:45:53 2014 -0500

    Changelog update for previous merges

commit ddbe9dcc375838d57c9d3243d6272d73bf0d69ae
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 23:29:58 2014 -0700

    fix for robotics access to the morgue.

commit 0183e53069627ff109f903e48cf3b6d3ac70198c
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 21:35:56 2014 -0700

    Fix for surgery doors.
    Fix for bad piping in medbay maintenance.

commit 6ae08b70eec87abe78e631bd772447c2e76fc44e
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 21:29:43 2014 -0700

    Fixed lack of genetics patient locker and virology doors preventing any way of seeing who's outside virology.

commit bbb44a178cc53a437f4a5dc2a7e05e3549ad9a81
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 20:57:39 2014 -0700

    Cleaned up the path to virology so it made a bit more sense. Brought virology north more to save space as well.

commit d0510b0ce995cdbdce7886f7d4e1b4dc83585aee
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 18:14:46 2014 -0700

    Fix for doubled up tanks in medbay maintenance.

commit 82c7207e35c273893d23ceb92b3304bee37ea4c9
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 18:12:48 2014 -0700

    Fix to genetics door access.

commit 15eb7c1bb3619360a3e756aeb2743214ef0d46f1
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 18:09:01 2014 -0700

    removed piano from bar

commit 8cb97330a716d0e1bf329350bbcd5fc0fb6e3c23
Merge: 04aec7b 56ef5c1
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 30 16:57:01 2014 -0700

    Merge pull request #4657 from Baystation12/dev-freeze

    0.1.10 Staging [Standby]

commit 04aec7b88552e007ae0ca4fa7a9c10f447620748
Merge: da722fd 6568f4a
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 30 17:29:49 2014 -0500

    Merge pull request #4651 from Jarcolr/patch-1

    Added more value to misc. supply crates

commit da722fd8f6a49e6ac2f955f469bc0d69934caddc
Merge: 02ba14e 5836931
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 30 13:46:13 2014 -0500

    Merge pull request #4648 from GinjaNinja32/master

    Add colour to AI private channel (144.7)

commit caedff90ff37ba482ff4f41d1212ded6795f5960
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sun Mar 30 15:06:14 2014 +0300

    Fix for #4536

    Currently using the GitHub Desktop App,time to see if I did it right; if
    any side effects happened.

commit 27ab635fe257921a5d0b79385bbbd91340717089
Merge: 53d0fac 02ba14e
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sun Mar 30 14:32:53 2014 +0300

    Merge pull request #1 from Baystation12/master

    Updating fork

commit bf7684bced304b7ec80d8d22e56c0f394631ad5f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 30 02:49:33 2014 -0500

    Lagsie no more, NarSie HUNGERS

    removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

    Much quicker :)

commit 6568f4acfdb5464055bbc7258a67386b51bc099d
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Sun Mar 30 00:13:56 2014 +0200

    Added more value to misc supply crates

    Your junk is even more junk-ish now!

commit 12b5db483e212cc5deaf83704a35f33ce0244128
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 29 16:07:47 2014 -0500

    Oversight, miners can now bump mine boulders just like the rock around them.

    Screw you xenoarch code, screw you.

commit 02ba14ea8b72ade2251d4f678a7e366323eb8362
Merge: b5dfa3f e3bc3ff
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 29 15:04:51 2014 -0500

    Merge pull request #4645 from Jarcolr/patch-1

    Potato in processor doesn't instantly transform into fries anymore

commit 5836931a174008b20e2e38eebed7b197eed7de73
Author: GinjaNinja32 <ginjaninja32@gmail.com>
Date:   Sat Mar 29 18:22:36 2014 +0000

    Add colour to AI private channel (144.7)

    Changes the AI private channel colour to magenta (#ff00ff), and changes
    the marker from [144.7] to [AI Private].

    Magenta is far enough from the Science channel (#993399) to be obvious,
    but I'm open to alternative suggestions.

commit 56ef5c165c03b7d22411c8679e8ba4d9c2606c25
Merge: 820b5e0 b5dfa3f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 28 18:46:04 2014 -0500

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

    Conflicts:
    	code/modules/reagents/reagent_containers/food/cans.dm

commit b5dfa3f08d0fa3c13d86abe215836257f55f92e0
Merge: 581cc2b b83c993
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 28 14:42:51 2014 -0500

    Merge pull request #4642 from Furlucis/master

    AI firelock using fix

commit e3bc3ff64c52916fccfd6eccab2a5687a8864eef
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Fri Mar 28 21:14:31 2014 +0200

    Removed text that came from nowhere..?

    uhh..

commit aae897f48f170f1f41703718fb2cabb97bb6bebf
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Fri Mar 28 20:55:10 2014 +0200

    Potato in processor doesn't transform into fries anymore

    What it says on the tin. Fixes issue discussed in #4596.

commit 581cc2bfea094056b180190dbd71e305efb5aac1
Merge: 60b6daa 77c7384
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Mar 27 15:13:02 2014 +0300

    Merge pull request #4640 from Glloyd/holo2

    Fixes Holodeck exploits (Fixed)

commit 60b6daadee31374fa56bcd641e1192a5e9bb0054
Merge: d238c25 936db26
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Mar 27 15:12:19 2014 +0300

    Merge pull request #4641 from Ccomp5950/log_fix

    *NIX Log files part 2.

commit d238c25a62e6c60cb1b6da2486c37976384d43a6
Merge: 38a22e8 bee3d30
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Mar 27 15:10:59 2014 +0300

    Merge pull request #4639 from Ccomp5950/oops_mesons

    Oops, broke Mesons when I fixed NVG's

commit b83c99316cce1b0ee3afdf27117ff4a33098b477
Merge: ac92364 38a22e8
Author: Furlucis <Logman115@gmail.com>
Date:   Thu Mar 27 02:34:30 2014 -0400

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

commit ac923649eb82c627448f364488680965a3ad4aeb
Author: Furlucis <Logman115@gmail.com>
Date:   Thu Mar 27 02:16:38 2014 -0400

    Allows AIs to use hazardlocks

    I am absolutely certain that there is a better way to do this. Someone
    else can do it, I'm just making it work.

commit 936db263ef46b6c1b24f60104cc647201a31f7cc
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Mar 26 18:51:37 2014 -0500

    *NIX Log files part 2.

    CR+LF added to new lines, created a global variable log_end that can be used
    on newlines

    log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

    put [log_end] prior to any \n and it will show up correctly in windows.

    Also created log_misc() proc to log to diary, and removed a bunch of

    diary << stuff all over the place.

commit 77c7384eec9dd2f2c6b70cd2da80fc7e3315c88f
Author: Graham Lloyd <glloyd9714@gmail.com>
Date:   Wed Mar 26 19:16:33 2014 -0400

    Map 2 the electric... Eurgh.

commit eb7baa787c424bb46ae1beda271deb910c5f0d92
Author: Graham Lloyd <glloyd9714@gmail.com>
Date:   Wed Mar 26 19:14:39 2014 -0400

    Holorack

commit bee3d30baa1900294fdb0e93e8fd2d99ec625f16
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Mar 26 17:19:51 2014 -0500

    Oops, broke Mesons when I fixed NVG's

    This should put things back where they go.

commit 820b5e0d9b6b0ccbbeb82c469f012702a804b141
Merge: 74045c2 d6a9448
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 25 23:12:21 2014 +0300

    Merge pull request #4632 from Ccomp5950/apc_low_charge_fix

    Bugfix for new APC code, gridchecks won't just turn off equipment.

commit 38a22e880f8e1fbbda245285cae451b5e2b56228
Merge: 7a5cc13 2073d7d
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 25 08:45:53 2014 +0000

    Merge pull request #4623 from Ccomp5950/bugfixes

    Bugfixes, Various

commit 7a5cc13e1097db3e3ac671b8a3db04d3cea11ac5
Merge: 9d1ecdf e54ce88
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 25 08:45:31 2014 +0000

    Merge pull request #4625 from Ccomp5950/nvg-fix

    NVG Bugfix

commit 74045c2b79f29f7c272a2e36791a43337d5004bb
Merge: 46f753b d432490
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 25 05:01:11 2014 +0300

    Merge pull request #4628 from Mloc/bs12-lightingrevert

    Revert fancy lighting code

commit d6a94485358032c3b4813fffd1104af05d7dde2c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Mar 24 17:42:27 2014 -0500

    Bugfix for new APC code, gridchecks won't just turn off equipment.

    Was a problem with me switching the order of the checks.

commit d4324901d33210d71f06969ffd43adcb2bee1ac8
Author: Mloc-Hibernia <colmohici@gmail.com>
Date:   Mon Mar 24 13:55:41 2014 +0000

    Revert "Merge pull request #4478 from Aryn/master"

    This reverts commit 86941a58f0e2a6ccd5cd4b9b7afc33b461257a46, reversing
    changes made to 65b8215ec767640d1cadc03d0e9494fb21875a78.

commit 34c39e773a6f8407d25f831f6eb613ebaf3923d5
Author: Mloc-Hibernia <colmohici@gmail.com>
Date:   Mon Mar 24 13:55:23 2014 +0000

    Revert "Merge pull request #4513 from Aryn/master"

    This reverts commit fa88663c23c206c187bcdcc0a364ce5f345d9830, reversing
    changes made to 608c48c6dbec5c59e05c61b209eada6c630a5a6b.

commit 1233e5568fd6f57e10f6ceef9017f6f7c1938ad7
Author: Mloc-Hibernia <colmohici@gmail.com>
Date:   Mon Mar 24 13:54:50 2014 +0000

    Revert "Merge pull request #4541 from comma/dev"

    This reverts commit 596b6084e3f9eee62e960379ec764518c14dff7d, reversing
    changes made to fa88663c23c206c187bcdcc0a364ce5f345d9830.

commit dc97a2502a0f37ecc851ec26e9966104c3f8062b
Author: Mloc-Hibernia <colmohici@gmail.com>
Date:   Mon Mar 24 13:54:11 2014 +0000

    Revert "Merge pull request #4607 from Aryn/master"

    This reverts commit a1fee3e6c358eda0efdfd5d511acf20a02d79fae, reversing
    changes made to bf4533efde728d6da8756ef3fa27532936c82c42.

commit e54ce881ebd7b5efb5950e8f31b94463f8b86f34
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 13:49:44 2014 -0500

    NVG Bugfix

    Now they work, and also added a green hud element that tints the screen green when nvg's are worn.

commit 9d1ecdfbe823a14e8427532918bec032e45259af
Merge: 2a0e93b 28392e9
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 23 17:22:18 2014 +0000

    Merge pull request #4618 from Ccomp5950/mob_controller_controlled

    Code Effeciency project:  mob_controller / human and monkey Life()

commit 2a0e93bd9382e208e16ed0781e8d0095870c851e
Merge: f5b8c72 a18dcaf
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 23 17:07:32 2014 +0000

    Merge pull request #4624 from zekesulastin/magazine-inversion

    Fixed 45-cal magazine icon filling inversion

commit a18dcaf0e125fcf5284cdb52b83e561135cc9349
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Sun Mar 23 12:46:28 2014 -0400

    Fixed 45-cal magazine icon filling inversion

commit 2073d7dc783eb60b2044f482cb7d03ae49ff6712
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 06:18:02 2014 -0500

    Bugfix 4:  Return of the access to engineering dorms.

    Medical now has access to engineering dorms and because they have to walk through it, engineering break room.

    Medics are wimps, if they shit up the break room engineering can just smack them around with some tanks or something.

    Fixes #4583

commit 0225d7b3b05b09f7aed66a1de249e7f871803325
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 06:03:04 2014 -0500

    Bug fix 3:  Now with a vengence.  Monkey pockets cause scrolled chat.

    Added the check to see what you clicked in the inventory when clicking on pockets and added a message for it.  Now it won't just be a line break.

    Fixes #4601

commit 46f753b3ee6de738b2c1f1971dc0720e40ca1b75
Merge: a1fee3e 4fd42af
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 23 10:57:52 2014 +0000

    Merge pull request #4617 from Vetinarix/dev-freeze

    Medbay Tweaks

commit d08bff84c9aeb5ece71cc036f67753e9b0d54fee
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 05:43:18 2014 -0500

    Bugfix 2: Electric Boogaloo, Ninjas being tracked by AI's

    Removed AI's ability to track them sneaky ninja's.

commit 6fa08b233d236144641389f83654c98c0cc8e458
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 04:44:06 2014 -0500

    Law office -> Internal Affairs in Area code.

    fixes #4577

commit f5b8c72ecd49b8a3c0829f42172d660b0defdd8a
Merge: 6f8b599 7000cce
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 23 10:33:16 2014 +0300

    Merge pull request #4622 from Ccomp5950/log_fix

    Admin Request:  Logs now will end in CRLF on unix systems.

commit 7000cce408e54c178cab69c90f647614462b7e12
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 23 02:26:06 2014 -0500

    Admin Request:  Logs now will end in CRLF on unix systems.

    Also removed the "SERVER HAS CALLED FOR A VOTE" spam

commit 6f8b59979402b30cd6e6bfbcb327e50b38e79d2f
Merge: 62db272 0e36957
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 22 21:00:50 2014 +0300

    Merge pull request #4615 from Ccomp5950/nano_ui_admin_fix

    VV drop down menu to resend NanoUI resource files.

commit 28392e94149d833ef8df4260ffd993c02ca40854
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 22 07:50:23 2014 -0500

    Code effeciency project:  handle_virus_something() (human and monkey /Life())

    2 for loops is more expensive then what we're doing here.
    Also we check to see if virus2 is populated before starting a for loop

commit 8106b6a4ae255eacd3d9a261aaed53e62da21ae1
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 22 06:56:09 2014 -0500

    Code Effeciency project:  Damn monkies Life()

    pretty much the same effeciencies from human/life()

    no need to updatehealth() over and over and over
    no need to process environment if everything is normal
    etc.

commit ce83c5c64e3461726b2cef08cbc1e131766f653f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 22 06:22:01 2014 -0500

    Code effeciency project:  handle_environment (human/life())

    Before:  We process a whole lot of bullshit for no real reason most of the time because temperatures are perfect.

    Now:	 We check if our temperatures and environment are within normal bounds and get the hell out of the proc.

    Also:    Mobs that are long dead or just dead mobs spawned at round start won't process Life(), those 3 clowns don't need Life(), those jerks.

commit f1506acf1ec3efcd2741ae71c3a0f8e7b7eb08e5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 22 04:33:48 2014 -0500

    Code effeciency project:  Handle_Organs (human/life())

    We do a bit of pre-processing to see if we want to do checks on all the organs.

    First we don't even do preprocessing unless we have damage of some kind
    afterwards we process what is hurt until it gets better or overall we get worse
    when we go ahead and check everything else out again.

    Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.

commit 4fd42af8465a024e5b6cd15917f505ce15b04e62
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Mar 22 18:16:26 2014 +1100

    Medbay Tweaks

    deleted second psych apc, changed around medical reception a bit, gave
    medical access to incinerator, made quarantine airlock bigger, added
    lighting to decontamination, bits and bobs.

commit 62db2723dda96ce4eddcdc141313ef79128cbf55
Merge: 8db88ba 37a4b9e
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 22 02:07:58 2014 -0500

    Merge pull request #4614 from LightningIron/master

    Added Alden-Saraspova counters to excavation closets.

commit 0e369578cc7ebdfe94049def45da5ccb450606a7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 21 23:03:06 2014 -0500

    VV drop down menu to resend NanoUI resource files.

    Some players are having issues with NanoUI not opening up or acting funny
    before the only fix was to have them log out, and log back in, check if that worked.
    If not log out, delete cache log back in, if that don't work not much can be done.

    Now we just skip the whole logout login thing and force the server to send the files
    to their client once again skipping the need for their character to take a dirtnap for a moment.

commit 8db88ba00a931c9da571ee62d69c5602712df876
Merge: ae2c398 731f08e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Mar 22 10:45:24 2014 +1030

    Merge pull request #4613 from Ccomp5950/ipc_fixes

    IPC Fixes:  "OH NO ROBOTIC LIMBS...on a robot...no shit" and Rejuvination fix.

commit 37a4b9e7da3a6e9e061a0ffa909663b3b4c69473
Author: LightningIron <LightningIron@github.fake>
Date:   Fri Mar 21 15:24:19 2014 -0500

    Added Alden-Saraspova counters to excavation closets; item previously unobtainable.

commit a1fee3e6c358eda0efdfd5d511acf20a02d79fae
Merge: bf4533e fc49951
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 21 07:27:47 2014 -0500

    Merge pull request #4607 from Aryn/master

    Lighting Fixes Volume II: Return of the Bugs

commit bf4533efde728d6da8756ef3fa27532936c82c42
Merge: d9885da 9ade063
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 21 07:14:20 2014 -0500

    Merge pull request #4608 from Vetinarix/dev-freeze

    Medbay Tweaks

commit fc49951f7700e1533f0cd8ff87d5b141caf532b5
Author: Aryn <aryn@weirdness.com>
Date:   Thu Mar 20 05:46:47 2014 -0600

    Reduced six-state lighting to five-state, removed debug verbs.
    Not a big drop in quality, but reduces the states used by half.

commit 731f08eb10ee978ed98285cfd358d476aefc5e7d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Mar 20 20:31:33 2014 -0500

    Rejuvination verb fix for IPC's limbs don't suddenly become organic.

commit 5dbc141b9ba6bdcfbb23616b9fa0951121166a1b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Mar 20 20:15:02 2014 -0500

    IPC examination won't cause "OH NO ROBOTIC LIMBS" (no shit, yo!) messages.

    Unless they are damaged.

commit ae2c398b2655e5c9e22ada57a41bf4b0555eb829
Merge: ea46d87 de86280
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Thu Mar 20 11:22:37 2014 +0000

    Merge pull request #4611 from Aryn/to-master

    Ctrl-H "faggot" to "meatball" and one icon state change.

commit de8628043422bafd00b57ea5aad942bc75f0d514
Author: Aryn <aryn@weirdness.com>
Date:   Thu Mar 20 04:48:08 2014 -0600

    Ctrl-H "faggot" to "meatball" and one icon state change.

commit 0d6aa7f862f18d1a2fe7924a08909cddbbb33c15
Author: Aryn <aryn@weirdness.com>
Date:   Thu Mar 20 00:37:34 2014 -0600

    Added the ability to use multiple light icons to represent over four states.

commit 9ade0632cee51bbeef8fd47d84a869c5988675cc
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Mar 20 16:37:28 2014 +1100

    Medbay: Doors + Holopads

commit 01ba7b4dadbe75992d97373645ab15cc282a5d27
Author: Aryn <aryn@weirdness.com>
Date:   Wed Mar 19 21:02:23 2014 -0600

    Fixed issues with cyborgs deactivating flashlights, cleaned up some module code in the process.

commit ea46d87bfbeeb139b435803420b286bdba99dc26
Merge: ca7b457 b6768b0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Mar 19 15:07:36 2014 -0500

    Merge pull request #4604 from Jarcolr/patch-2

    Telescopic baton no longer stuns

commit ca7b457f65d1669187526d2df05714e0dbb6c5e2
Merge: 83d028e 6300e85
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Mar 19 15:06:48 2014 -0500

    Merge pull request #4603 from Jarcolr/patch-1

    Fixes #4600

commit a5db0c852fb3fd14bee790a5267bda5b48c382bb
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 19 22:10:32 2014 +1100

    Medbay Changes

    Secondary storage duplicated table contents fix, emergency entrance door
    button, viro corridor now a decontamination room too! (it was big and
    long and boring since it got change to 3 wide.

commit 1b8dc12a7c167fa9c2a0c25f173d997944a8eb26
Author: Aryn <aryn@weirdness.com>
Date:   Wed Mar 19 01:02:27 2014 -0600

    I think I fixed everything it is possible to stuff a light source into.

commit 9007aedf15e38a096e94e43f5d473ced1a49a042
Author: Aryn <aryn@weirdness.com>
Date:   Tue Mar 18 21:57:15 2014 -0600

    Fixed an annoying bug with giving another player a flashlight,
    opened up at least 100 individual bugs where people kept setting
    loc and expecting light updates to catch it.

commit 7e08bca4ef44d3ead2e6fb97b49916f7de672c18
Author: Aryn <aryn@weirdness.com>
Date:   Thu Mar 6 09:54:18 2014 -0700

    One runtime fixed, other one didn't turn up.
    I put in some stuff for it to be easier to find if it does.

commit d9885dac74fa06c6f360aa044f23b03aca7f8583
Merge: 7307b94 98fba3b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 18 19:47:09 2014 -0500

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

commit 98fba3b6b0b735c08f2001445938148b1ec92d8a
Merge: b05f4df 83d028e
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 18 19:44:19 2014 -0500

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

    Conflicts:
    	code/modules/mining/machine_processing.dm
    	code/modules/mob/living/carbon/human/life.dm
    	code/modules/mob/living/silicon/ai/ai.dm
    	code/modules/virus2/helpers.dm

commit b05f4df282be7a0e8f0f3066ba39a66893478b21
Merge: 79f1269 ddb414d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 18 14:37:16 2014 -0500

    Merge pull request #4602 from RKF45/mining

    Removal of plasma glass

commit 79f1269c7bb6a680237dd22d432db81c8427537f
Merge: 4d18880 38825a2
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 18 17:21:46 2014 +0000

    Merge pull request #4598 from MrLeebo/biogenerator-fixes

    Biogenerator fixes

commit b6768b0af011764486aa06d3504c79ad5b01e360
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Tue Mar 18 18:30:08 2014 +0200

    Telescopic robuster no longer has the stun

    It's about time somebody did this. It still has the really really annoying/bad brute damage, but it doesn't just knock you on your ass in one hit anymore.

commit 6300e859a2cc34967c0bd37fa780e8245ed438cb
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Mon Mar 17 23:13:29 2014 +0200

    Fixes #4600

    Will fix #4600 and the problem with drinks not knowing when they are open/closed.
    Hopefully I didn't miss a string of code again,I don't think so,though.

commit ddb414d7402606c94c3be31b500867f584813d5b
Author: RKF45 <rkf45codes@gmail.com>
Date:   Mon Mar 17 20:37:10 2014 +0100

    Removal of plasma glass

commit 83d028e394944225768961b57ed9a98447720cd6
Merge: b4ef26c 7ce4073
Author: Mloc <colmohici@gmail.com>
Date:   Mon Mar 17 19:14:20 2014 +0000

    Merge pull request #4588 from Ccomp5950/ore_process_optimize

    Code effeciency project:  Ore processing.

commit 38825a2ddcf3be88f4d9e0369e3237b0e2015b9c
Author: Jeremy Liberman <mrleebo@msn.com>
Date:   Sun Mar 16 21:43:55 2014 -0500

    Reading comprehension fail

    Gave a better "already loaded" text to the bio-generator.

commit 31c79acd6e5f8ecee512a91f4a01631d2431b450
Author: Jeremy Liberman <mrleebo@msn.com>
Date:   Sun Mar 16 21:01:02 2014 -0500

    Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays

commit b4ef26cef832dcc7510b8387b5e2e5b10297e4fe
Merge: 38c84de 6e56a81
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 17 04:47:50 2014 +0400

    Merge pull request #4594 from Ccomp5950/pda_fix

    PDA NanoUI bugfix.

commit 4d188806d75dc63ba99b315710fa40d63cf5125f
Merge: ac683c0 c614e51
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 16 11:49:30 2014 +0000

    Merge pull request #4587 from Vetinarix/dev

    Medbay: Scrubber Relocated

commit 38c84de28b0b99b50745b149fdd9557e6fcebd1e
Merge: 5e07307 31ed299
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 16 11:49:04 2014 +0000

    Merge pull request #4585 from Ccomp5950/hud-no-client

    HUD-Optimization bugfix, mobs with no clients will update their health

commit 6e56a81531f464a9fb7a3852d79c061962f3c5b8
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 16 04:07:46 2014 -0500

    PDA NanoUI bugfix.

    modes that update every 5 ticks won't require clicking the pda 5 times to get a UI window open.

    We now check to see if a UI already exists if not we don't check

commit 5e0730733f53e15d477ad08f23997713050ca66a
Merge: 30309d4 53d0fac
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 16 00:55:52 2014 -0500

    Merge pull request #4580 from Jarcolr/master

    Coin Flipping, AKA the D2

commit 30309d4432c653f416661fa3cb6ea7c1f372deab
Merge: 4ac6914 89b55a3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 16 08:24:48 2014 +0400

    Merge pull request #4593 from Segrain/master

    Smallfix.

commit 89b55a335ec02bf94f4f0ce16b1c4fa347e0001f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Mar 16 08:17:18 2014 +0300

    Fix for #4592.

commit 4ac6914c94384b5339b6cfcbd7e510eddea7c462
Merge: 08b9714 02cc696
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 15 23:07:30 2014 +0400

    Merge pull request #4591 from Segrain/master

    Smallfix.

commit 02cc696bf35820a2004b8c307ba03c18a3a9ce50
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Mar 15 23:02:57 2014 +0300

    Fix for #4589.

commit 08b971457318f138eec5ea6bbbbeec0e458ba9cc
Merge: 951b1b7 3d18b94
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 15 22:00:39 2014 +0400

    Merge pull request #4590 from Mloc/bs12-magicalwindoors

    Fixes #4589

commit 3d18b94d7dda7d25ec8e12f866358de2b9a45121
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sat Mar 15 18:02:24 2014 +0000

    Fixes #4589

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

commit 31ed2999c5fde2606c003775a57af590fb0badb5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 15 06:31:53 2014 -0500

    Runtime fix on spawned mobs with no minds/client.

commit 7ce4073135fe3bcb6809974741afbf34206ec11b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 15 04:05:56 2014 -0500

    Code effeciency project:  Ore processing.

    Before:  The stacker and processor used del(item) to get rid of the items causing /obj/movable/del() to spike up and cause fun amounts of lag.  Also we have seperate variables for if a certain ore type is selected in the processing machine and the cooking portion of process() uses a huge string of if()'s which check 8 or so variables and is terrible and probably a pain in the ass should someone decide to later add ore types and recipes.

    After:  We just set item.loc = null when it goes in the stacker of processor and garbage collection takes care of it within a tick.  Those different variables for ore selection are now just one variable which is a bitfield, much easier to read, much easier to expand upon.

commit c614e51f9f7b280c13313e8c13d1763a2affb0a3
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Mar 15 20:03:15 2014 +1100

    Medbay: Scrubber Move

    Changed the location of a scrubber which was blocking vision of one of
    the fancy new floor tile tags in Medbay.

commit f1fdbb02c0f0022755398e3a19ef2ea866d2c127
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 15 00:57:11 2014 -0500

    HUD-Optimization bugfix, mobs with no clients will update their health
    HUD image as well.

commit 53d0fac4e3d8f810dcf5760a9ba9e400ba5b602d
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Fri Mar 14 18:39:22 2014 +0200

    Small tweak to coin flipping.

    Last one,I swear.

commit ac683c07bef86fce96def197fe41b7ef9986538c
Merge: 0b49817 bd483cc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 14 18:24:43 2014 +0400

    Merge pull request #4581 from Ccomp5950/ai_apc_fix

    APC-Rewrite AI fix.

commit 0b49817d7924c3f4c052f670d30cca15a2672f45
Merge: 285ed05 5ed6e58
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 14 00:22:43 2014 -0500

    Merge pull request #4569 from comma/crabpack

    Crabpack

commit 285ed0546bc5aa24b1d24cb3f13970a31ecae6ca
Merge: 682d5da ba360a2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 14 00:22:19 2014 -0500

    Merge pull request #4567 from comma/virus-racism

    Virology shenanigans

commit bd483cc07227b921368ffafdd6215e8a907b2236
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Mar 13 21:49:03 2014 -0500

    APC-Rewrite AI fix.

    Before:  AI's on new APC system would constantly add more and more power usage to the APC

    After:   AI's no longer handle their power consumption, that has been pushed off to an /obj/machinery/ai_powersupply dummy object which will process the power usage.  This is much cleaner because machinery objects are already processed properly for the new system and keeps us from having to rewrite a bunch of AI code to bring the AI in line with how the new APC system works.

commit c8c7ea34e9966ca0774dcd26f17bffccc1265c9e
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Thu Mar 13 19:33:54 2014 +0200

    Forgot 	var/sides = 2

    Oops.

commit 682d5dadf739a75c0c1b4f536bc571420a7d12b4
Merge: 2980d43 4de35bf
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Mar 13 21:19:38 2014 +0400

    Merge pull request #4579 from Vetinarix/dev

    Moar Medbay (v2)

commit 51177f266319f5fefca137752b2d51f1538c68b0
Author: Jarcolr <amirhardiess13@gmail.com>
Date:   Thu Mar 13 18:56:01 2014 +0200

    You can now flip coins,AKA the D2

commit ba360a2c13bf5370bd13ca282f237c46cffdb7f2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Mar 12 18:39:51 2014 +0400

    Splicing virus changes it's unique ID.

commit 951b1b71fc449f889bf6565ca6c156c4b8808165
Merge: a5fb8ee dff0230
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Mar 12 07:58:19 2014 +0400

    Merge pull request #4575 from yashaldie/patch-2

    Fixes Diona Nymph handling updates

commit dff02306a32f6205076a7bee801449656f227e60
Merge: bdd955b 55e4317
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Tue Mar 11 23:07:14 2014 -0400

    Merge pull request #4 from yashaldie/master

    temp

commit 55e43176b8c0bef5c1784070569b30af59c808fe
Merge: ec0763c bdd955b
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Tue Mar 11 23:05:28 2014 -0400

    Merge pull request #3 from yashaldie/patch-2

    Fixes Diona Nymph handling updates

commit ec0763cff573f7702ceab66076aa77aac53cc051
Merge: 67dfe13 a5fb8ee
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Tue Mar 11 23:01:06 2014 -0400

    Merge pull request #1 from Baystation12/master

    getting all updates

commit a5fb8eec49319bd2ffb4524032d03d6149181560
Merge: d5cc1c7 94a4d27
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Mar 12 05:12:16 2014 +0400

    Merge pull request #4572 from yashaldie/patch-1

    Fixes adding encryption keys to borgs

commit d5cc1c7ad55bb4699dad4a0f12bffc0f2c8fcb23
Merge: 2a8cdc7 1f7a444
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Mar 12 05:11:54 2014 +0400

    Merge pull request #4578 from Loganbacca/bayfix

    Plasma glass processing fix

commit 4de35bf3bbc81f086203057b7e0716b647cf5891
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 12 11:59:56 2014 +1100

    Moar Medbay (v2)

    Rearranges secondary storage, fix psych apc

commit 1f7a444ab1e436c190b1d964fe5d039b6dd9cb5a
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Wed Mar 12 13:15:23 2014 +1300

    Fixed plasma glass outputting slag

    Fixes #4560

    Code was missing continue statements.

commit 2a8cdc7a1103a6273a24ab8ee492b1adf564be2e
Merge: 6771259 b429605
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 11 23:17:55 2014 +0400

    Merge pull request #4574 from Ccomp5950/optimization_cherrypick

    MedicHUD bugfix

commit bdd955b036222a63dbe45c3c952d11d2f0283f5f
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Tue Mar 11 05:45:10 2014 -0400

    Fixes Diona Nymph handling updates

    Diona Nymphs were not getting their Handling procs called.

commit b429605adc3ecd6362944e12d796deb18c9c5273
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 11 02:51:13 2014 -0500

    MedicHUD bugfix

    Because the HUD stuff is now in Life() if someone dies their healthbar and status aren't updated.
    We're fixing that here.

commit 94a4d27100f485f0d032438fd8724abe473335db
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Mon Mar 10 23:39:36 2014 -0400

    Fixes adding encryption keys to borgs

    adding Encryption keys were not working on borgs. and also causing a run-time error. This should fix it.

commit 6771259ae6cf40ad91d19198fbfb458773eda1b3
Merge: bf626ce ebc188c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 11 07:01:43 2014 +0400

    Merge pull request #4571 from Ccomp5950/optimization_cherrypick

    Optimization cherrypick  HUD's and Joblist

commit ebc188c600b49f568fe8cfdb8a0bd0d7a4b784c9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 10:25:36 2014 -0500

    Code effeciency project: HUD items rewrite

    Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

    After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

    Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

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

commit b03493fbaeb7e18842059ad7b84c61406864c61e
Author: ZomgPonies <lorden@zomgponies.com>
Date:   Sat Mar 1 00:41:18 2014 -0500

    Efficiency: Joblist

    Conflicts:
    	code/__HELPERS/global_lists.dm

commit bf626cedf3b2536f2930411471598b68f56505c5
Merge: b014e22 044766e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 11 02:54:48 2014 +0400

    Merge pull request #4570 from DJSnapshot/hotfix

    quick fix for APCs related to IPC charging.

commit 044766ef11f3fb6331777cb329010626a1780e5b
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Mar 10 15:52:01 2014 -0700

    quick fix for APCs related to IPC charging.

commit 5ed6e58430a97886288d0fdb721131bd2c302ce2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 11 02:06:30 2014 +0400

    Readded welder backpack.

commit f3bed7b1852b94058f9c39041e9f4d32d0555f94
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 20:58:13 2014 +0400

    Dreaded changelog.html

commit f60624e3af88faac94b88ae11df9417058b6f41f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 19:15:01 2014 +0400

    Fucking hate this file.

commit 2980d43e2ec105d7eeabd25621ea6045ebf8c03c
Merge: 838e1f9 0e08c90
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 19:10:27 2014 +0400

    Merge pull request #4565 from comma/dev

    Dev-freeze => Dev

commit 7307b942fcc434e02adca5a51239d24ec256e640
Merge: 38e7e14 b014e22
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 19:10:11 2014 +0400

    Merge pull request #4566 from comma/dev-freeze

    Master => Dev freeze

commit aa65639dad9daa2b7bb549c0dc4340e81f95c439
Merge: 16dd8bf 0e08c90
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 19:07:28 2014 +0400

    Merge branch 'dev' into virus-racism

commit 0e08c90571807ebee7ee6d959be1e145d7b016a2
Merge: 13b9747 b014e22
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 19:05:24 2014 +0400

    Merge branch 'dev-freeze' into dev

    Conflicts:
    	maps/tgstation2.dmm

commit 13b9747504c2d7e4a461f3553d9c02e343cfd7e3
Merge: 52ad2bc 838e1f9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 18:48:12 2014 +0400

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

commit 16dd8bfcd22b29b02241a18c689abc9d700fd4a1
Merge: ec9b53b 838e1f9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 18:43:34 2014 +0400

    Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into virus-racism

    Conflicts:
    	code/modules/virus2/helpers.dm

commit 838e1f95f41028fea1b93625be8186c2e46b8628
Merge: cd57156 c135216
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 18:00:36 2014 +0400

    Merge pull request #4561 from Vetinarix/dev

    Medbay Tile Tags!

commit c135216c4efcefd4d09a346059eb52e7ef26a3c5
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Mar 11 00:46:37 2014 +1100

    Sink in a wall, yo.

    Bastard!

commit caf76c6591cadccd280521c60f0753fa313bfff9
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Mar 11 00:40:57 2014 +1100

    Medbay Double Airlocks

    And another tile tag. Can't help myself!

commit ec9b53bcad4b05e145a0215926f4f838f5a80119
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 17:35:50 2014 +0400

    Lowered chance of exhale spreading viruses, as it was firing way too often.

commit d04b22e950c8098c9b81a213c8f92f965ce22cbd
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 17:10:35 2014 +0400

    Changed sneezing to spread viruses like cough, but only in front of the mob.
    It gives a warning sometimes, so guy has 7 ticks to face elsewhere.

commit fa274ab1a7d07da1966fc8d53135a844584721ec
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 16:16:14 2014 +0400

    Fixed blood injections not transmitting viruses properly.
    Keep forgetting that list is associative.

commit 8396546f06a650ea2cfe160a3259cefa41c7c232
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Mar 10 23:02:44 2014 +1100

    Viro Scrubber Fix

    Iz nao connect.

commit cd5715650b40421db4591a3a89f418ebae5d2d52
Merge: 0d06f80 084c075
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 15:54:41 2014 +0400

    Merge pull request #4553 from Ccomp5950/hud_rewrite

    Code effeciency project: HUD items rewrite.

commit 0d06f80c84525ad21f50cf43f70f6c6f87601e90
Merge: b2a7819 541c3ec
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 15:53:29 2014 +0400

    Merge pull request #4545 from Ccomp5950/apc_rewrite

    Effeciency Project: APC / Machinery power usage.

commit c28d501e5fe88bdc2561e570c30903b13bb0f837
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Mar 10 19:29:43 2014 +1100

    Lights in Viro Access

commit 3ab232c269589f96184cc6178e6274f8d2f0f3a1
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Mar 10 18:45:09 2014 +1100

    Floor Tiles + Chem Change

commit c49a77505767a73eb8f71709dfd8bb6a972f8286
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Mar 10 18:02:44 2014 +1100

    Moar Medbay Tile Tags!

    This is the way of the future!

commit b014e22972ef6e2352007e2322019da791d74952
Merge: 46e1cfe d1343c0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 23:55:29 2014 -0500

    Merge pull request #4552 from Loganbacca/efficiency

    Efficiency Project: Airlock Sensors

commit 46e1cfead72c9347ef5424d58533c25839fa0bdd
Merge: ddbc41b b95c437
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 23:54:20 2014 -0500

    Merge pull request #4551 from Furlucis/master

    Removes an unnecessary check

commit ddbc41b38861250fda522dfb09c6f68b03371994
Merge: 63e0c5b 36c3b49
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 23:54:07 2014 -0500

    Merge pull request #4549 from Loganbacca/bayfix

    Multiple map fixes

commit b2a7819df8bf4e3db3ad38b2a11816e23d474645
Merge: c24ee71 e862e01
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 23:53:44 2014 -0500

    Merge pull request #4537 from JoeyJo0/dev

    Yay smartfridges

commit e862e013e74ecc4e61ddfd302b66cf8acc1414a4
Author: Joey Haas <admin@joeyjo0.net>
Date:   Mon Mar 10 02:14:57 2014 +0100

    Smartfridges are now hackable. Also fixed a bug where one could not properly access the fridge in chemistry.

commit 3bd98fec1bfec2571530cbb1e188edf15b8939c1
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 00:26:37 2014 +0400

    Made it possible for virus to mutate and affect different species.

commit 12a97e01ebacaeb055e526840d49b754f34aa2ca
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 10 00:06:22 2014 +0400

    Fixed some runtimes with specieism, and blood transfer ignoring viruses' racial preferences.

commit 9cad9af0aa40afcae3116d32c92e4bf16d3863f7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 9 23:07:22 2014 +0400

    More random for random god.
    Effects now start with random chance of firing and multiplier (like forced minormutate() on spawn).

commit 0cb8a3377c0254bf22fd0abbe2871532cecedfcc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 9 22:57:09 2014 +0400

    Buffed protections.
    Full biosuits and spacesuits now protect more against airborne infections, and completely against touch-based ones (when worn with gloves).

commit 4177323dca767420d4b04ae252ecfac7b78825f8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 9 22:43:42 2014 +0400

    Spaceacilline stronk.
    Now it prevents new infections completely, and has a chance to cure virus on early stages (without giving antibodies though.)

commit a29e52b10c444bb6602012f64652c7cf3c44d5d5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 9 22:32:17 2014 +0400

    Stopped braindamage effect from dealing 4 digit amounts of damage to brain organ.

commit 16ab0c98851118cbfbb97d6cb29787950bd21c03
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 9 22:07:07 2014 +0400

    Fixes single pane windows not blocking airborne viruses completely.

commit 084c0754ad431f4705da35c73c65077fab277195
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 10:25:36 2014 -0500

    Code effeciency project: HUD items rewrite

    Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

    After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

    Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

commit d1343c09ab845d59915b655b059ff8e24e86c11b
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Mar 9 21:30:40 2014 +1300

    Airlock sensor tweak

    Because why not squeeze every last drop of performance out of it?

commit 63e0c5b980c61aacef68f5974c748fd32e0c352b
Merge: d853ec8 67dfe13
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 9 01:39:30 2014 -0600

    Merge pull request #4539 from yashaldie/master

    Fix for slime surgery runtime & o2 lockers bug

commit d4c24bc82499552d9a6a9b8507bc168fafe4591f
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Mar 9 17:30:43 2014 +1300

    Airlock sensor optimization

    Airlock sensors will now store the previous cycles pressure value, then compare it with the current pressure next time it runs.
    If the pressure hasn't changed it will skip sending a status update.

commit b95c437b0f682c586debf688261e0cfc975e13f8
Author: Furlucis <Logman115@gmail.com>
Date:   Sat Mar 8 23:15:53 2014 -0500

    Removes an unnecessary check

    The things you can attach to suits should already be determined by the
    allowed list, no need to restrict it based off of size if it's in the
    allowed items.

commit 36c3b49234b20c2c73d89f561bd280bc18967fe0
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Mar 9 09:34:45 2014 +1300

    Multiple map fixes

    Fixes #4507
    Fixes #4508
    Fixes #4540

commit d853ec8ef00a77cfb8643a3f33bb64435964013e
Merge: e5f7d0a 2877b27
Author: Mloc <colmohici@gmail.com>
Date:   Sat Mar 8 17:49:39 2014 +0000

    Merge pull request #4544 from Ccomp5950/mob_debug

    Debug Options:  Gives us an idea of what mobs are taking so long to proc...

commit e5f7d0a94c39a2937459a7bc7a85fa7cd51ca70b
Merge: 72ea2d5 4dba89a
Author: Mloc <colmohici@gmail.com>
Date:   Sat Mar 8 17:48:57 2014 +0000

    Merge pull request #4543 from comma/master

    Fix for #4542

commit 541c3ece760244be9c47a9fbe7f07510ae64d702
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 8 05:45:22 2014 -0600

    Bugfix:  All APC's will have maxcharge of 5,000

    and not be at the whim of lag / how quickly it generates it's cell.

commit fb04a88774fdd98901d34001772baf5a9ea65083
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 8 03:55:22 2014 -0600

    Removed my debug lines.

commit bb9a66cc3a035bcb76989e2da3f402ad2e702ac2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 8 03:42:44 2014 -0600

    Effeciency Project:  APC / Machinery power usage.

    We no longer run auto_use_power() on every machine every tick.
    We now have a global list of areas, and areas that have an APC in them (all_areas and active_areas) no more looping through world bullshit.
    A bunch of snowflakey as fuck machines won't use_power() in their process, you get two options, active and idle, use them!
    This means a lot of machines won't double dip on power as well so power usage for the station has dropped about 20%

    Because everything is snowflakey as fuck we're going to have some machines that don't force an update on their power usage.  Fuck them.
    We should catch them with the root obj/machine/proc's forcing updates.

commit c58314bae36250067014d3447bbedc28411d9e55
Merge: c906fbf 52ad2bc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 8 12:04:17 2014 +0400

    Merge branch 'dev' into virus-racism

    Conflicts:
    	code/modules/virus2/helpers.dm

commit 52ad2bc4fb3a7b306083efdf85552c9a9fdd83ba
Merge: cca2c99 c24ee71
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 8 12:03:27 2014 +0400

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

commit cca2c997dfa2bfbab4b23c3a48484609f77a6a19
Merge: d6115c9 4dba89a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 8 12:02:32 2014 +0400

    Merge branch 'master' into dev

commit 2877b27399143a669dd0f6dd248c805c24c9d837
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 8 01:44:43 2014 -0600

    Debug Options:  Gives us an idea of what mobs are taking so long to process

    Adds an "Expensive Mobs" list that shows what mobs took more then 1 decisecond to process.

    This way if mob controller is going nuts we can debug master controller and see why, or atleast see which mob it is.

commit e0e1bd9cfb65bcda2436c06f7b6c2558d4ecd70e
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 7 23:42:28 2014 -0600

    APC Area update initial commit.

commit 4dba89a288bb155a8db05590f6ab54cd99a8b8a7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 8 03:38:30 2014 +0400

    Fix for #4542
    Now synthetics do not contract viruses

commit c906fbf7dd675ce8fc6373594f876367ad4d8714
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 8 03:32:10 2014 +0400

    Added system for viruses to affect only certain species.
    Currently it ignores synthetic species competely.

commit 38d43fa97120a3ceb95831331df9ca65b208f5c0
Author: Joey Haas <admin@joeyjo0.net>
Date:   Fri Mar 7 21:39:06 2014 +0100

    Medbay, Xenobiology and Virology now have secure smartfridges.

commit 78e4f7e12676c506838a41ef88db369e897de1a8
Author: Joey Haas <admin@joeyjo0.net>
Date:   Fri Mar 7 21:32:13 2014 +0100

    We now have secure smartfridges. More changes:
    Changed xeno smartfridge to a secure smartfridge.
    Added a chemistry/medical smartfridge for easy chemical storage.
    Smartfridge usage now leaves fingerprints.
    Secure smartfriges are emagable, by the way!

commit 401e814654826fa6bc89e0f7f8505fb941468198
Author: Joey Haas <admin@joeyjo0.net>
Date:   Fri Mar 7 03:15:04 2014 +0100

    Added floors with 1,2 and D on them into medbay.

commit df9e9d4afe75e2e09efb29f426a41f0981163928
Author: Joey Haas <admin@joeyjo0.net>
Date:   Fri Mar 7 02:33:58 2014 +0100

    Maintenance fix at medbay, added emergency air and added markings to emergency air supplies.

commit c24ee718d40225bb6555234267537759f805a1d8
Merge: 596b608 1201499
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Mar 7 10:21:54 2014 -0600

    Merge pull request #4527 from RavingManiac/dev

    Chemistry, bar and virology smartfridges. Ingestion reagent transfer delay. Piano

commit 596b6084e3f9eee62e960379ec764518c14dff7d
Merge: fa88663 d6115c9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Mar 8 00:38:12 2014 +1030

    Merge pull request #4541 from comma/dev

    Sanity plugs for two runtimes in lightning code

commit d6115c97dfa7e87516932a0f6d82f200a22c49cb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 7 18:06:17 2014 +0400

    I CERTAINLY DID NOT MAKE A TYPO WHAT ARE YOU TALKING ABOUT

commit 0dd51f338c130fa6afdf65136bbcd9aaeb0f1bc9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 7 17:57:44 2014 +0400

    Sanity plugs for two runtimes in lightning code

commit fa88663c23c206c187bcdcc0a364ce5f345d9830
Merge: 608c48c b5bdfc2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 7 17:51:55 2014 +0400

    Merge pull request #4513 from Aryn/master

    Space Lighting Fixes

commit 72ea2d5dbedb2af1d1bbbe760abf24cac5989300
Merge: 3554a7b 5c8fddc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 7 17:32:47 2014 +0400

    Merge pull request #4531 from Mloc/bs12-libnudge

    Fix for a server-crashing issue in libnudge.

commit 3554a7be4f1b6aa41be63b6bb4e59f437b66d116
Merge: 08ba326 63a2789
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 7 17:32:26 2014 +0400

    Merge pull request #4535 from Mloc/bs12-'

    Fix for apostrophes in IRC nudge.

commit 67dfe130346471b374bd5a947a272844dced636b
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Mar 7 05:43:31 2014 -0500

    Fix for O2 wall lockers breaking

    Fixes #4538
    also found when you tried to weld it it would break the sprite also
    made the toggle verb just call the attack_hand proc to remove some items from the locker.

commit 421b1ea6ef447c96190425b186fc7fd1e6780f45
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Mar 7 04:56:49 2014 -0500

    Fixes for slime surgery runtime

    don't know why the slime is coming though even though the target is supposed to be human...

commit 69dfb927192cd19b9885409b14d12caf16d498e1
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Mar 7 04:55:23 2014 -0500

    Fixes for slime surgery runtime

    don't know why this works but it does and doesn't break other surgeries from what i can tell

commit 1201499a392f3c3014af7b55842e23fc87179340
Author: RavingManiac <heisen51@gmail.com>
Date:   Fri Mar 7 00:49:22 2014 +0800

    Changelog.

commit 71e4ec5e636d65a0a69e5695e71cc1475ec867c3
Author: RavingManiac <heisen51@gmail.com>
Date:   Fri Mar 7 00:45:01 2014 +0800

    Added piano/minimoog to bar. Fixed Chemistry area.

commit 32938edf3664d0173ccd5b069092a65b75c035a9
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 20:37:23 2014 +0800

    Smartfridges (bar, chemistry, virology) readded.

commit 01f31142e4ad46c1745d0b5dbee7d871ce9305e1
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 20:27:08 2014 +0800

    Temporary map revert to fix map cleaning.

commit 7b9c525276f1265d79408beb1a971100cb8a90be
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 20:24:07 2014 +0800

    Minor update to changelog.

commit b969e680b279756cc2b0ad41a5ffb268805c9024
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 20:20:15 2014 +0800

    Ingested acid and mutagen will now react after the ten second delay.

commit f022a19452bbd9502f62208e726fb20c7c32d10a
Merge: 8126611 608c48c
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 19:22:06 2014 +0800

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

    Conflicts:
    	maps/tgstation2.dmm

commit 63a27890fe9b04cc86290f26b3e6723aad579405
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Thu Mar 6 09:36:58 2014 +0000

    Fix for apostrophes in IRC nudge.

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

commit 08ba326878c493040fad580442c6e89af4273fac
Merge: 16b1626 74a8fa1
Author: Mloc <colmohici@gmail.com>
Date:   Thu Mar 6 09:09:48 2014 +0000

    Merge pull request #4532 from Ccomp5950/apc_breaker

    APC overlay bugfix.

commit 16b1626b5733462517fc4c88d7fc62247b76344d
Merge: a379be8 aa9141f
Author: Mloc <colmohici@gmail.com>
Date:   Thu Mar 6 09:09:05 2014 +0000

    Merge pull request #4525 from Ccomp5950/pda_nano

    PDA NanoUI Optimizations.

commit a379be8a55132d2c112742230c94e135029b0872
Merge: cd05816 8911478
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Mar 6 02:22:41 2014 -0600

    Merge pull request #4533 from DJSnapshot/hotfix

    Non-whitelisted IPCS. The real fix this time.

commit 89114787e378e91575d1d950dc2b9032a844c883
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Wed Mar 5 23:44:03 2014 -0800

    Non-whitelisted IPCS

    Had to do a hacky fix. there was no real way around it.
    Also, a couple balances with IPCs
    And a totally silly death animation (Which has been commented out for now)

commit 608c48c6dbec5c59e05c61b209eada6c630a5a6b
Merge: e8d0426 7c1a6af
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Mar 5 11:30:31 2014 -0600

    Merge pull request #4528 from Vetinarix/dev

    Medbay Tweak

commit 8126611ebf26ec1d358cd0832a34d82c2c3c7b73
Author: RavingManiac <heisen51@gmail.com>
Date:   Thu Mar 6 00:05:44 2014 +0800

    Changelog updated.

commit 3b2d3eba05e5696a7918e9587c0bcbbdff36ef22
Author: RavingManiac <heisen51@gmail.com>
Date:   Wed Mar 5 23:41:42 2014 +0800

    trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.

commit cd05816c0fd037ee828628793aea35d64e4b587f
Merge: 98b45e5 2063909
Author: Mloc <colmohici@gmail.com>
Date:   Wed Mar 5 12:43:14 2014 +0000

    Merge pull request #4529 from JoeyJo0/master

    Fixed two small bugs

commit 5c8fddcad087f49ea2bbb3bfa2345d42e2856936
Author: Mloc <colmohici@gmail.com>
Date:   Wed Mar 5 12:37:11 2014 +0000

    fuck

commit e8d04262a5a69051ee95e824683bb68db328c877
Merge: c066232 9561635
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 4 23:11:43 2014 -0600

    Merge pull request #4524 from Ravensdale/PROTECITON

    Define spelling correction

commit 74a8fa152c13750612284f8afe96860f80f59b41
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 4 20:57:40 2014 -0600

    APC overlay bugfix.

    Before: If you turned off the breaker and fiddled with on/off states and turned on the breaker it wouldn't update the overlay because the check_updates wasn't doing an if(operating) check and would think it didn't need to update the overlays once you turned on the breaker.

    After: Check_update() is doing a check for the breaker being on or off and taking that into account with the update_overlay flags and will update the overlays properly.

    Thanks Razharas from /tg/ #coderbus for bringing this to my attention.

commit 7c1a6afa76e52233d20f1d5b1394e96e13e62f07
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 12:39:08 2014 +1100

    Bugged out file attempted fix v2

    compile.sh seems to think it's been changed but theres no diff...

commit ec28dc6e45e6d723dee3ec86122b7f013f725ada
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 12:37:27 2014 +1100

    Bugged out file.

    Something funky went on with the compile.sh file when I merged. Replaced
    it with the proper dev branch version.

commit ac41ea9080624a60e6464efe963f5495a26c59a7
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 12:29:50 2014 +1100

    Map Changes redone.

    After a little bit of buginess in the merge, map's all good now.

commit c785b8e3c487832556b1c953c4cb3c37457242d1
Merge: ee617bc c066232
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 12:27:24 2014 +1100

    map fix 1

commit ee617bc4f8dabc8052e8664c154234689d98c38a
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 12:23:49 2014 +1100

    Dev Update

    Update my Dev repo to bs12's dev post master merge. Should allow pull
    request to automerge now.

commit c066232ab30bb5b3f1aa3bfb0cb6d7a0312e0ccf
Merge: 8b5cf26 98b45e5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Mar 4 18:29:03 2014 -0600

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

commit 2063909ab00f56c9547838af11f7ff239e89f699
Author: Joey Haas <admin@joeyjo0.net>
Date:   Tue Mar 4 23:51:12 2014 +0100

    Fixed the bug where mech fabricators would get stuck whenever the RnD console was not found.

commit 43d6412322cae11847fd57dd1ea0985e646f29a3
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Mar 4 22:14:57 2014 +0000

    Fix for a server-crashing issue in libnudge.

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

commit 844a856281bfa99ec8c598ea41f5d55d26221d84
Author: Joey Haas <admin@joeyjo0.net>
Date:   Tue Mar 4 18:49:55 2014 +0100

    Fixed some machinery frames saying they need Manipulators instead of Micro Manipulators.

commit 411b8784bac34f9b5705a86dbd781cbb0c464495
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 04:06:03 2014 +1100

    Medbay Viro Access Change

    After consultation on IRC, widened viro access corridor, shifting rooms
    surrounding it.

commit 727b87730b178c149670cbc5a4a6f4a5c5203690
Author: RavingManiac <heisen51@gmail.com>
Date:   Wed Mar 5 00:03:57 2014 +0800

    Smartfridge variations added to chemistry, bar and virology. One of the virology windows didn't have sides, so I fixed that.

commit e8d0990db3f5aac7fcd55db57e1121ea19922293
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Mar 5 02:34:54 2014 +1100

    Medbay Star of Life Logo aesthetic change

    Added a gradient to the sign because as was rightfully pointed out,
    solid colours are dull!

commit 98b45e52ac1af51f3da2a9167ac4e461726cafe2
Merge: 8fa689a 61a4e37
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 4 18:18:33 2014 +0400

    Merge pull request #4518 from yashaldie/master

    fixes IPC brain surgery

commit 8fa689a43380adbe1326512bf00502229bd76085
Merge: 557f8c7 8deed8d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 4 18:18:10 2014 +0400

    Merge pull request #4521 from Mloc/bs12-bloodyipcs

    Dionaea can no longer steal blood from species which have the NO_BLOOD flag

commit 8b5cf2621cf6be454cce7a8102d45af0244c311e
Merge: f4ca963 1d62ced
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 4 18:16:26 2014 +0400

    Merge pull request #4472 from Vetinarix/dev

    Medbay Renovation

commit 557f8c7e92ad3d3027d457794d78fc89886087a3
Merge: 8d048c0 4989042
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Mar 4 18:13:48 2014 +0400

    Merge pull request #4526 from Mloc/bs12-libnudge

    Adds a C library alternative to the ircbot nudge script.

commit 1d62ceddaa912c26f58145759847f61b89d085b2
Merge: 52ae8a9 f4ca963
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Mar 4 22:19:09 2014 +1100

    Merged Upstream

    This is a big one.

commit f4ca9631b52a5217d27d12c906e7504e40c26d0f
Merge: 367b019 c5261a2
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 4 10:15:42 2014 +0000

    Merge pull request #4504 from MrLeebo/severed-limbs-drop-cuffs

    Fractures and severed limbs cause cuffs to fall off

commit 8d048c0179cc3461649d8c21303caa6b6803deca
Merge: 5d1b485 01e66b6
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 4 10:14:55 2014 +0000

    Merge pull request #4519 from Furlucis/master

    Meat cutting fix

commit 367b0190cb4edc2c1b86e1079793ef46adc3c72e
Merge: 826b8d8 787ea32
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 4 10:14:47 2014 +0000

    Merge pull request #4514 from JoeyJo0/3dglasses

    Added 3D glasses to dormitory.

commit 826b8d87c953ee62480837c6d16f2d66f0f85365
Merge: fa06f6b 5b633a1
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 4 10:14:42 2014 +0000

    Merge pull request #4515 from JoeyJo0/shipment

    Added '50 wooden plaks' to shipment list.

commit 5d1b4851e49a80abb281ee9f62a3cf7d4d4a0f18
Merge: 4ddd799 1c596f2
Author: Mloc <colmohici@gmail.com>
Date:   Tue Mar 4 10:13:58 2014 +0000

    Merge pull request #4520 from alex-gh/cryopod_fix_bs12

    Despawning in cryo pods no longer prematurely end rev rounds.

commit 49890421f8c7873f9fbf5be873141525ffede609
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Mar 4 10:08:17 2014 +0000

    Adds a C library alternative to the ircbot nudge script.

    This allows for more secure and stable transmission on Linux, but you might see some improvements on Windows too.
    Code lies in (confusingly) lib/src.
    nudge.c should be compiled to lib/nudge.[dll/so] and be linked against netutil.c.

    There's some horribly hacky code in nudge.c to assemble pickled data, but it's probably the fastest way that's still safe.

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

commit 52ae8a90a9e067059157af2400ba8fd9c65671c1
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Mar 4 19:23:53 2014 +1100

    Medbay buttons

    Button access changes!

commit aa9141fb75c5ee0bf4d93b7234bd5105aae9e9ea
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Mar 3 22:50:24 2014 -0600

    NanoUI Optimizations.

    We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

    Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

    Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
    Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

    Some other things that I just can't remember right now.

commit 95616359426adf92b01f862b2168918eb3dd401f
Merge: 50a45b3 fa06f6b
Author: Ravensdale <Tri@rdinn.com>
Date:   Mon Mar 3 20:26:58 2014 -0800

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

commit 50a45b32aeda4d8dc68d893b4c46494f7e820101
Author: Ravensdale <Tri@rdinn.com>
Date:   Mon Mar 3 20:23:21 2014 -0800

    Fixes a define spelling error.

commit 5f4f01a9db6fac1c5b62823e7b6987436edaa566
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Mar 4 14:03:38 2014 +1100

    Viro Intercoms

    Added intercoms to Virology

commit c5261a2796bab8e2abb99d7b48b8c8a8ecd128cd
Author: Jeremy Liberman <mrleebo@msn.com>
Date:   Mon Mar 3 20:24:09 2014 -0600

    Wearing masks or straight jackets blocks chewing on your wrists

commit 4ddd799359e89299d0fff74ef1cf9603101b4bce
Merge: d94e032 8f2d5e8
Author: Mloc <colmohici@gmail.com>
Date:   Mon Mar 3 19:21:05 2014 +0000

    Merge pull request #4505 from Ccomp5950/ert_admin_only

    Configuration option:  Ability to set ERT to be admin call only.

commit 8deed8ddddf87df9c20001304a2c980a13e55cf1
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon Mar 3 09:15:35 2014 +0000

    Dionaea can no longer steal blood from species which have the NO_BLOOD flag

    Fixes #4510

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

commit 1c596f2ff2336dafa999ee46dd14a47ac8f0d66f
Author: alex-gh <alexgh@sempto.net>
Date:   Sun Mar 2 04:41:06 2014 +0100

    Despawning in cryo pods no longer prematurely end rev rounds.

commit 01e66b6733e30681ca0b10666562947d10d33ddc
Author: Furlucis <Logman115@gmail.com>
Date:   Mon Mar 3 02:26:04 2014 -0500

    Meat cutting fix

    The other kind of knife actually exists. This one doesn't.

commit 61a4e37466b937a4f598ddcf09e4f22db8714d71
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Mon Mar 3 01:18:31 2014 -0500

    fixes IPC brain surgery

    could not start the brain surgery on IPCs this should fix it

commit d94e032861d96199895427c47cfe373e97fe9471
Merge: 8abbd52 51eb1a6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Mar 3 06:32:35 2014 +0400

    Merge pull request #4516 from Furlucis/master

    IPC icon fix

commit 51eb1a6641f7e4fd143eb03c1b772e2aff4d9657
Author: Furlucis <Logman115@gmail.com>
Date:   Sun Mar 2 20:43:06 2014 -0500

    IPC icon fix

    Pawn's fix for IPC icons overlapping stuff.

commit 8abbd527033848fa490967c2211255f183916982
Merge: 3711210 d53263a
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sun Mar 2 15:48:12 2014 -0800

    Merge pull request #4506 from Mloc/bs12-wtfaccess

    Optimizes /obj/New() by removing access generation

commit d41d3b2b9e27d3beb5f3ce1acb8355ca9eda57b1
Author: Jeremy Liberman <mrleebo@msn.com>
Date:   Sun Mar 2 15:08:55 2014 -0600

    Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic

commit 5b633a1d9a21c605f19efe853c067f8fcb83538d
Author: Joey Haas <admin@joeyjo0.net>
Date:   Sun Mar 2 21:35:10 2014 +0100

    Added '50 Wooden Planks' to shipments

commit 787ea323609771f71f186d80a99282cb55727840
Author: Joey Haas <admin@joeyjo0.net>
Date:   Sun Mar 2 21:31:46 2014 +0100

    Added 3D glasses to Dormitory

commit b5bdfc27b0ca23e0593cbb97b1b867ef608d203d
Author: Aryn <aryn@weirdness.com>
Date:   Sun Mar 2 13:11:14 2014 -0700

    Set lighting overlay's name to empty string.

commit 37112105f64e1e585fe2939d02cc92f5a8720d31
Merge: 4cf37b7 5146268
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 2 19:56:23 2014 +0000

    Merge pull request #4499 from Ccomp5950/runtime_fixs

    Runtime fix: Depth scanner now won't check the length of null lists.

commit d53263a49ba151621674ac1aec596368a6310e71
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sun Mar 2 15:12:56 2014 +0000

    Optimizes of /obj/New(), by removing access generation.

    Previously, every single /obj would parse the req_access_txt and req_one_access_txt strings and turn them into a list of numbers for the access system.
    This is now done the first time check_access() is called, so only objects that actually use the system will have the lists generated.

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

commit 7947523b043e3bc5e7f8df6809bd9423eadca59d
Author: Aryn <aryn@weirdness.com>
Date:   Sun Mar 2 07:27:33 2014 -0700

    Fixed some bugs regarding space lighting.

commit 2c947e135f613c737edfbbb9f343553ec6c50a3a
Author: Aryn <aryn@weirdness.com>
Date:   Sun Mar 2 06:53:11 2014 -0700

    Fixed supply shuttle bug wherein the area types were actually tags.

commit 8f2d5e817f162f54c79c5ff64b813c4faa343300
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 2 06:20:26 2014 -0600

    Configuration option:  Ability to set ERT to be admin call only.

    Admin request.

    Default behavior is what we're used to, that two heads can call for the ERT
    with the option turned on it removes the ability for players to call for an ERT and requires admin intervention.

commit 4cf37b7eb1d383657f4eb7cda014ccbb7cfec0cd
Merge: 1b8eb18 6622bbb
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Mar 2 05:11:20 2014 -0600

    Merge pull request #4503 from Loganbacca/bayfix

    Engineering revamp fixes

commit fa06f6ba75c3fa18ecd5bb2b876bdbc85c5d8a40
Merge: 77767db 61fe10f
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 2 10:56:26 2014 +0000

    Merge pull request #4498 from ZomgPonies/bs12

    Efficiency: Job lists

commit 1b8eb18450cbca0c8b7822a8aa74f16c3c0ff67b
Merge: 960e90d 051e2f0
Author: Mloc <colmohici@gmail.com>
Date:   Sun Mar 2 10:54:51 2014 +0000

    Merge pull request #4497 from Ccomp5950/sort_files

    Server log files are now sorted when using .getruntimelog or .getserverlog

commit 4025ccbee5d34b93cebfb01cd90ae3553bd9aacb
Author: Jeremy Liberman <mrleebo@msn.com>
Date:   Sat Mar 1 22:53:23 2014 -0600

    Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free.

commit 6622bbb89668e18ef18c7792571e5c7f799e402c
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Mar 2 17:06:00 2014 +1300

    Engineering areas fix

    Previously I had the engineering and atmos monitoring rooms sharing the same area. To separate the air vents I changed the air vent and air alarm frequencies. This works, but could be a little confusing to some when there are air vents listed by the air alarms that don't work (since air alarms don't filter out vents on different frequencies). This splits the rooms into separate areas to avoid unnecessary confusion.

    This was also the case with the hallway outside the engine monitoring room.

commit fa048ddfb05ffc243705afb051365f0602cae99b
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Mar 2 16:27:14 2014 +1300

    Map fixes

    - Added AI holopads to engineering.
    - Added bot navigation beacon to aft hallway.

commit b357344bf3ca6f04254b7236118ff4fedb2e8ac5
Author: Aryn <aryn@weirdness.com>
Date:   Sat Mar 1 14:43:39 2014 -0700

    Temporary commit to back up data.

commit 960e90dcbe81bbc159b3175a5f568de7e3815982
Merge: 5c482f1 9d8e9a3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 1 22:43:48 2014 +0400

    Merge pull request #4500 from Ccomp5950/diona_fix

    Dionaea aren't invisible anymore.

commit 9d8e9a3af8389b22fe6c18aa14c67f9853ab01af
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 1 12:40:35 2014 -0600

    Dionaea aren't invisible anymore.

commit 61fe10fe3d8452a09f436b38abe7c0d5a47dfa63
Author: ZomgPonies <lorden@zomgponies.com>
Date:   Sat Mar 1 00:41:18 2014 -0500

    Efficiency: Joblist

    Conflicts:
    	code/__HELPERS/global_lists.dm

commit 5c482f1c8ce6612d616a871cc3112905125ef6b5
Merge: c8f2d85 3d7b7a9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 1 11:07:41 2014 -0600

    Merge pull request #4494 from yashaldie/master

    Fixed Borg toggling broadcast mode

commit 77767db80009367861630e743f00b5e0ea12deeb
Merge: c60a0aa d4cce9b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Mar 1 10:55:18 2014 -0600

    Merge pull request #4487 from zekesulastin/laser-scalpel

    Laser Scalpels Ver. 1

commit 9b2d6569fc760b90c6f5f828b835b67e29678e21
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Mar 2 03:01:07 2014 +1100

    Medbay CMO desk paper

commit 47532351a1d7ccab076f32fec4092a198be14850
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Mar 2 02:55:14 2014 +1100

    Medbay Changes

    + A Captain Door opening button thang.

commit c8f2d85b410b2e56687fdb2acecbcfa5bbd4600e
Merge: 103c189 8e1b286
Author: Mloc <colmohici@gmail.com>
Date:   Sat Mar 1 15:52:03 2014 +0000

    Merge pull request #4493 from Loganbacca/baytweak

    Little things

commit 51462682535897edccc37eaf255094470823d670
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 28 23:03:10 2014 -0600

    Runtime fix: Depth scanner now won't check the length of null lists.

    runtime error: Cannot read null.len
    proc name: scan atom (/obj/item/device/depth_scanner/proc/scan_atom)
      source file: tools_depthscanner.dm,31
      usr: Some Guy (/mob/living/carbon/human)
      src: the depth analysis scanner (/obj/item/device/depth_scanner)
      call stack:
    the depth analysis scanner (/obj/item/device/depth_scanner): scan atom(Some Guy (/mob/living/carbon/human), Rock (155,169,5) (/turf/simulated/mineral))
    Rock (155,169,5) (/turf/simulated/mineral): attackby(the depth analysis scanner (/obj/item/device/depth_scanner), Some Guy (/mob/living/carbon/human))
    Some Guy (/mob/living/carbon/human): ClickOn(Rock (155,169,5) (/turf/simulated/mineral), "icon-x=23;icon-y=13;left=1;scr...")
    Rock (155,169,5) (/turf/simulated/mineral): Click(Rock (155,169,5) (/turf/simulated/mineral), "mapwindow.map", "icon-x=23;icon-y=13;left=1;scr...")

commit 051e2f0ce39f8172dc5b686a25eb71ddb55cd0bd
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 28 22:37:36 2014 -0600

    Server log files are now sorted when using .getruntimelog or .getserverlog

commit 103c189ea1834537e4ff4bc603ac86e17f43a2df
Merge: d55687a 4492648
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 28 19:45:25 2014 -0600

    Merge pull request #4496 from DJSnapshot/hotfix

    Lots of fixes

commit 449264849135c8d0bff10188845a1a335e355078
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 28 17:38:58 2014 -0800

    server crash fix based off of https://github.com/tgstation/-tg-station/pull/2943/files

commit 1e186839c6aab8db52b25e8a32e5969cdf30867c
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 28 17:36:50 2014 -0800

    added IPCs(machines) to list to make it easier on everyone.

commit 3b10ee3ad515b7b6eed29e655b188e26d1dd0dda
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 28 17:32:29 2014 -0800

    Removing IPC whitelist requirement.

commit acdbb3573a5a99c959d1cd65d3858b7f93cc4993
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 28 15:28:11 2014 -0800

    Changed supermatter messages to reflect what they actually mean.

commit d55687a9da8d388772485891afdecc5de577dadc
Merge: 4dba3aa 38e7e14
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 28 13:15:32 2014 -0800

    Merge pull request #4484 from Baystation12/dev-freeze

    [Standby] Dev freeze 0.1.9 staging

commit 4116e320eab9163f0d3045097c8833dc756da373
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Mar 1 00:45:30 2014 +1100

    Medbay Changes

    A few items, a few doors.
    This is all coming from writing a huge manual for the Medbay.
    Little things to improve everywhere.

commit 1827363168ae2554860a4bfbca49be5d2559f737
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 28 23:40:06 2014 +1100

    Medbay door name change

    I wish I wasn't a perfectionist. Someone save me.

commit 6e161e1a1c130ed013db6be80b018c05c690b453
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 28 22:38:30 2014 +1100

    Medbay: This should do it.

    Plumbing, Intercom, Power mapping verbs all good.
    Don't think I'll find any more trivialities that can't wait.
    Of course, I say that now but...

commit 3d7b7a937c96e0a9185fcb5435edacb86b9e1ed8
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Feb 28 05:42:42 2014 -0500

    Missed some codes...

    Forgot to add some code from a past bug fix i did on my end.

commit a0bb14f76edc46715b0a170eb4a9e5fe30db1959
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Feb 28 04:58:49 2014 -0500

    borg radio fix

commit 96dc185fdecf88a3cd2235e16ae07f63076b007c
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Feb 28 04:42:27 2014 -0500

    Update robot_modules.dm

commit 36b4af57f20e1caf4687e83ca1ffad2d4c8a4157
Author: yashaldie <yashaldie0807@yahoo.com>
Date:   Fri Feb 28 04:40:36 2014 -0500

    made module contain channel list

commit 43a5c27e3fdc5c0e7b6c0c2d3f79ee446c7a35f0
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 28 20:40:09 2014 +1100

    Medbay

    Wall Closets + Medicine Storage change

commit 8e1b286a846ce64d67b3662fc43bbcc2f33de78c
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 27 18:39:11 2014 +1300

    Mining drill text

    - Adds drill_verb variables to pickaxe subtypes, so drills will now be described as "drilling" instead of "picking"

commit fbfdccebaf50761de01e54e283ab51a34dfd8674
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 27 17:04:37 2014 +1300

    Suit sensor toggle

    - Changes the suit sensor toggle verb to select from a list, instead of cycling through one mode at a time.

commit 38e7e14a54bb5ef499468a43931675f0cac953e9
Merge: c56ec21 4d21a55
Author: Mloc <colmohici@gmail.com>
Date:   Thu Feb 27 21:25:11 2014 +0000

    Merge pull request #4488 from Loganbacca/freezefix

    Minor camera fix

commit c60a0aa39928942676f36758f1b300f5deb15350
Merge: 9c2e3ef c4f6a66
Author: Mloc <colmohici@gmail.com>
Date:   Thu Feb 27 21:24:46 2014 +0000

    Merge pull request #4485 from Aryn/master

    Fixed nuke shuttle being a swirly vortex of death.

commit 9c2e3ef84aaa501781bf6402d72efae7f1c4b309
Merge: 39383c3 ac8f545
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 27 03:42:51 2014 -0600

    Merge pull request #4483 from Loganbacca/chemsmoke

    Chemsmoke tweaks and bug fixes

commit 86afa559e60f664805f535534027d0865b7f9204
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Feb 27 17:10:41 2014 +1100

    Atmos Changes - Logan

    Thank you :3

commit ac8f5451e8d74db2ea1f452651c1532093578593
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 27 14:09:47 2014 +1300

    Chemgrenade fix

    - If check to handle grenades detonating in a mobs hand correctly.

commit 4d21a55196900838b958f5e542c2e07ce4ed2fed
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 27 12:04:44 2014 +1300

    Minor camera fix

    - Fixed missing camera c-tags.
    - Fixed camera orientations.

commit d4cce9be6661bc4276af2055e02c660fc84fe052
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Wed Feb 26 15:23:08 2014 -0500

    Laser scalpels are now producable

commit 39383c331ab95a7dd20ca7a731571a91bdc32586
Merge: 86941a5 c56ec21
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Feb 26 09:38:40 2014 -0600

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

commit c56ec21ee3bcb85b20e686829f866c9e38481607
Merge: 29ac1cf 4dba3aa
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Feb 26 09:34:38 2014 -0600

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

    Conflicts:
    	code/modules/reagents/Chemistry-Reagents.dm

commit f163b2126c6b800c71e6ce1a6c952ea406686bf6
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Feb 27 02:18:57 2014 +1100

    Medbay Changes

    Dayum. I think I'm nearly there.

commit c4f6a66d3def27644acee8f45bdeace28c3d1b78
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 26 08:16:52 2014 -0700

    Fixed nuke shuttle being a swirly vortex of death.
    This bug was actually in legacy ShareSpace code,
    I'm surprised it wasn't noticeable in the old ZAS.

commit b45c17e57802f8498bab27c22acc0ba6f9753996
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Feb 27 01:42:37 2014 +1100

    Medbay

    Last changes for the day.
    How do I stop tweaking things?!

commit 4f0cc7c40f596c5f94006d0b0d158539f0b329c3
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Thu Feb 27 00:49:56 2014 +1100

    Names

    A few object name changes.

commit 9b4d44b958960a53aed6f9a29766ba89f71c97be
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 23:38:58 2014 +1100

    Medbay general tweaks.

    Still going.

commit 53b338060c8c8b4c83aed6aa2149d9fef5abde2d
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 27 00:59:01 2014 +1300

    Chemsmoke tweaks and bug fixes

    - Renamed the variable for the smoke density mechanic to density. Also clamped it to a minimum of 1 so it cant multiply reagents.
    - Added some checks so the chemsmoke effect doesn't run if it's in nullspace.
    - Removed an unnecessary distance calculation.
    - Added a null turf check to prevent runtimes if a really big smoke grenade goes off at the edge of the map.
    - Added a check so the reagent copy code doesn't run if there's no reagents to run it on.

commit 81874acd97ea4924bbb6e3d81a355466e5c00810
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 22:28:56 2014 +1100

    Moar cabling tweaks.

    Finding these due to a rigid assessment I'm doing of the Medbay. Might
    stop committing for now. I keep hoping I'm done and then I'm not.

commit 8a514312b1134fe670e3955298efc37c7cccee60
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 22:20:43 2014 +1100

    Medbay Cabling  tweaks

commit c1dd2b562a5794ab558425b49ac76d22029f3bd1
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 21:38:00 2014 +1100

    virology isolation door names

commit ac1be46fc769067a562422c92a93fed14196dfb5
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 21:02:44 2014 +1100

    Medbay Area Tweak

    Reception Office Door

commit 309cd0844db526dae74c76f4887be11848a461b6
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 21:00:11 2014 +1100

    Medbay Area Tweaks

commit 4f433af6fa788295b450c359fc670e67f848d3d7
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 19:45:15 2014 +1100

    Blast Door Rename

commit f96caf2bea9a2e5c4e6f178d2931aac69fd16cd7
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Wed Feb 26 19:38:30 2014 +1100

    Patient Wing tweak

    added a small lounge

commit 86941a58f0e2a6ccd5cd4b9b7afc33b461257a46
Merge: 65b8215 84f02ae
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 25 16:44:07 2014 -0600

    Merge pull request #4478 from Aryn/master

    New Lighting

commit 2b3c2064da04954fcd9343cfd562006246f50448
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Tue Feb 25 15:10:28 2014 -0500

    Initial run of surgery steps for laser scalpels

commit 4dba3aa7ee576edf52afc6e5129fdc46c23aaa1b
Merge: 0544b58 f5ab084
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 26 00:41:17 2014 +0400

    Merge pull request #4482 from Mloc/bs12-attacklog

    Fixes admin attack logs to show up in-game as well as in the logfiles.

commit f5ab084eaccce49ea0bfc1f5c866944300063b16
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Tue Feb 25 20:36:46 2014 +0000

    Fixes admin attack logs to show up in-game as well as in the logfiles.

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

commit 72eba68bd8dfbd9429bcad57aaf1d9ad000e74dd
Author: ZekeSulastin <zekesulastin@gmail.com>
Date:   Mon Feb 24 17:37:19 2014 -0500

    Added laser scalpel items

commit 29ac1cf06b4b531ea8f11069570c6209d55e750f
Merge: 63a0f11 32de00e
Author: Mloc <colmohici@gmail.com>
Date:   Tue Feb 25 19:47:01 2014 +0000

    Merge pull request #4476 from SueTheCake/dev-freeze

    Spooky Ghost Gun Fix

commit 3edf49edb3bf322b7380dd2604afaf21eba6b93b
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 22:06:49 2014 +1100

    medbay shutters tweaks

commit 7504d79dc44a9edfabfbb84d4cbf9d392ca57905
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 20:17:41 2014 +1100

    scubber overlay fix

commit dd7ac4666c2f029b26ff2e66eeb0a9169b01bb2d
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 18:39:48 2014 +1100

    Atmos fix

commit 0544b58b3709b30a5b02202910a5e086e54d591b
Merge: 0ba65ef 3ab7e84
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 25 10:42:39 2014 +0400

    Merge pull request #4481 from Ccomp5950/runtimefixes

    Runtimefixes 2 electric boogaloo or how I learned to love null checks.

commit 3ab7e8438a2aa07335f34be7b2913ce437d7ca2e
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 25 00:28:00 2014 -0600

    Runtime fix:  Sparks trying to delete that which does not exist.

    runtime error: Cannot execute null.delete().
    proc name: start (/datum/effect/effect/system/spark_spread/start)
      source file: effect_system.dm,204
      usr: Mark Hoover (/mob/living/carbon/human)
      src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
      call stack:
    /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()
    runtime error: Cannot execute null.delete().
    proc name: start (/datum/effect/effect/system/spark_spread/start)
      source file: effect_system.dm,204
      usr: Mark Hoover (/mob/living/carbon/human)
      src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
      call stack:
    /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()

commit ceb220f7055dea16a5253b1068467a54fa13d52d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 25 00:21:41 2014 -0600

    Runtime fix:  OH GOD NOT THE BEEs WON'T SOMEONE CALM THEM DOWN?

    Other then NULL?

    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91
    runtime error: Cannot read null.type
    proc name: Life (/mob/living/simple_animal/bee/Life)
      source file: bees.dm,91

commit e098746209559582d846eac5cf24a18e75cea63f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 25 00:20:44 2014 -0600

    Runtime fix:  RP_Revolution's auto_add_rev_head loves that null.

    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198
    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198
    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198
    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198
    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198
    runtime error: Cannot read null.client
    proc name: process (/datum/game_mode/revolution/rp_revolution/process)
      source file: rp_revolution.dm,198

commit f06cd34863e3ca2c06b42f6f81b85fb651093631
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 15:12:56 2014 +1100

    derpfix

commit 6f154c4e712f8e8b6dab5176ffaef872bf03a22b
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 15:10:02 2014 +1100

    int revert

commit a4c454f96654469810b48842ced28791784cc08b
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 15:07:22 2014 +1100

    int revert

commit 34bce9d931725fca6e306ac0a5dd00cc5d3ae9ba
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Tue Feb 25 15:03:26 2014 +1100

    Disposals/Mail fixes

commit 0ba65efd18edf58cd3110643ee09dd051f50b943
Merge: 23faf80 0f538a9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 25 06:01:59 2014 +0400

    Merge pull request #4477 from Ccomp5950/runtimefixes

    Runtimefixes

commit 23faf801ae8806545366241ad0889d8e38a49b77
Merge: fa2061a bd55850
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 18:59:54 2014 -0600

    Merge pull request #4468 from Segrain/master

    Bugfixes.

commit bd5585052c67e0adc9f6e905d79860d460d45ea8
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Feb 25 03:33:18 2014 +0300

    Fix for #4479.

commit fa2061a249dd783698e963a2797ce371d5341f26
Author: Mloc <colmohici@gmail.com>
Date:   Tue Feb 25 00:11:07 2014 +0000

    Fix for ban queries.

commit 84f02ae47c1ea01d49b872e446ca78bc87bcacfd
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 07:55:36 2014 -0700

    Reverted unrelated ZAS modification and unnecessary check.

commit 9f92792d7476d96ec435db12ed82d8c0ec01960e
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 07:12:40 2014 -0700

    Fixed ghosts' lighting toggle. Mesons still look weird.

commit 1ae892d732c774d1df02454c77f91f0e58797165
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 06:43:07 2014 -0700

    Updated the changelog.

commit 130f58a41c26d34b7a1cbb3d61ecd99fb08292eb
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 06:39:50 2014 -0700

    ChangeTurf()... We meet again...

commit e32066cd3f05de3cc0174513db7dd646c5301fa9
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 05:54:06 2014 -0700

    Modified the way lighting initializes to fix light glitches in engineering.

commit 3c2e65cf5d64b1999e06aac980b7c0c21f612490
Author: Aryn <aryn@weirdness.com>
Date:   Mon Feb 24 03:35:07 2014 -0700

    Lighting code complete.

commit 7f4c4715e73fd46f9d4c0be4e9ce06a2ba28da98
Author: Aryn <aryn@weirdness.com>
Date:   Sun Feb 23 22:51:47 2014 -0700

    Lighting seems to be working now.

commit ca7d4026b83db7214e9e8eb44a72374e4c648987
Author: Aryn <aryn@weirdness.com>
Date:   Sun Feb 23 07:50:58 2014 -0700

    Lighting system is too buggy to continue until I know wtf is going on

commit 8a3b99aa6800fb90fe088a3420dea3559d08dbae
Author: Aryn <aryn@weirdness.com>
Date:   Sun Feb 23 01:40:51 2014 -0700

    Added lighting code, didn't include it yet.

commit 0f538a9b2faae56f86eb630298ba0234cce92bb6
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 01:50:44 2014 -0600

    Typo fix.

    Screw typechecks and their need for closing parens :*(

commit f071421552188fa08ac19f042d244ef2777dc706
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 01:39:25 2014 -0600

    Runtime fix:  Null isn't really that sharp.

    runtime error: Cannot read null.sharp
    proc name: is sharp (/proc/is_sharp)
      source file: unsorted.dm,1270
      usr: Arthur Ward (/mob/living/carbon/human)
      src: null
      call stack:
    is sharp(null)
    the police tape (/obj/item/tape/police): breaktape(null, Arthur Ward (/mob/living/carbon/human))
    the police tape (/obj/item/tape/police): attack hand(Arthur Ward (/mob/living/carbon/human))
    Arthur Ward (/mob/living/carbon/human): UnarmedAttack(the police tape (/obj/item/tape/police), 1)
    Arthur Ward (/mob/living/carbon/human): ClickOn(the police tape (/obj/item/tape/police), "icon-x=16;icon-y=10;left=1;scr...")
    the police tape (/obj/item/tape/police): Click(the floor (172,128,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=10;left=1;scr...")

commit 3d8899812320df31b5dab37f9d0472370b70dc37
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 01:35:04 2014 -0600

    Runtime fix:  usr = 0???

    runtime error: Cannot read 0.item_use_icon
    proc name: remove gun icons (/client/proc/remove_gun_icons)
      source file: targeting.dm,273
      usr: 0
      src: Vivalas (/client)
      call stack:
    Vivalas (/client): remove gun icons()
    the taser gun (/obj/item/weapon/gun/energy/taser): dropped(Jonathon Sommer (/mob/living/carbon/human))
    Jonathon Sommer (/mob/living/carbon/human): drop r hand(null)
    Jonathon Sommer (/mob/living/carbon/human): update canmove()
    Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
    Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
    Jonathon Sommer (/mob/living/carbon/human): apply effect(5, "weaken", 0)
    Jonathon Sommer (/mob/living/carbon/human): apply effects(0, 5, 0, 0, 0, 0, 0, 0, 0)

commit d5951781fdeaf675508fa5d67bb44e130dde63df
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 01:27:04 2014 -0600

    Runtime fix: Alarms keep trying to heat up space.

    runtime error: Cannot execute null.heat capacity().
    proc name: process (/obj/machinery/alarm/process)
      source file: alarm.dm,186
    runtime error: Cannot execute null.heat capacity().
    proc name: process (/obj/machinery/alarm/process)
      source file: alarm.dm,186

    over and over and over.

commit 75116bfd53602c49da55fc477cbfe004ff2addc0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 01:16:19 2014 -0600

    Runtime fix:  Someone using a gas mask with no tank...IN SPACE

    runtime error: Cannot read null.oxygen
    proc name: copy from (/datum/gas_mixture/proc/copy_from)
      source file: FEA_gas_mixture.dm,480
      usr: null
      src: /datum/gas_mixture (/datum/gas_mixture)
      call stack:
    /datum/gas_mixture (/datum/gas_mixture): copy from(null)
    Basileus (/mob/living/carbon/human): breathe()
    Basileus (/mob/living/carbon/human): Life()
    /datum/controller/game_control... (/datum/controller/game_controller): process mobs()
    /datum/controller/game_control... (/datum/controller/game_controller): process()
    runtime error: Cannot read null.toxins
    proc name: breathe (/mob/living/carbon/human/proc/breathe)
      source file: life.dm,339
      usr: null
      src: Basileus (/mob/living/carbon/human)
      call stack:
    Basileus (/mob/living/carbon/human): breathe()
    Basileus (/mob/living/carbon/human): Life()
    /datum/controller/game_control... (/datum/controller/game_controller): process mobs()
    /datum/controller/game_control... (/datum/controller/game_controller): process()

commit 0bcd89360a26223820d5b7ef0b89baf4de7fc5eb
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 00:51:57 2014 -0600

    Runtime fix:  I have no UI, and I must close it.

    runtime error: Cannot execute null.close().
    proc name: Topic (/obj/item/device/pda/Topic)
      source file: PDA.dm,485
      usr: Garry Myers (/mob/living/carbon/human)
      src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
      call stack:
    PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
    NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
    NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))

commit 1eb66f1f78d7cc8261a3d488ec90e961f3d60ae2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 00:47:55 2014 -0600

    Runtime fix blood_DNA length checks when it's possibly null.

    runtime error: Cannot read null.len
    proc name: attack self (/obj/item/weapon/melee/telebaton/attack_self)
      source file: swords_axes_etc.dm,156

commit cea151813e72e5ac6b01cc2a48659622bfce093d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 24 00:44:00 2014 -0600

    Runtime fix: Dirt in SPAAAAACCEEEEEEE

    ndefined variable /turf/space/var/dirt
    proc name: reaction turf (/datum/reagent/space_cleaner/reaction_turf)
    source file: Chemistry-Reagents.dm,939

commit 6f5fe197b631725d6bfaa3ed25f7d3f8be6f7c7e
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Feb 24 12:37:48 2014 +1100

    Medbay Tweaks

commit faa1dd38baba38752bbc7d0fdf4e4b6b86f7b4e5
Merge: b8fdcbb d95caff
Author: Mloc <colmohici@gmail.com>
Date:   Sun Feb 23 15:03:02 2014 +0000

    Merge pull request #4473 from Ccomp5950/dev_power

    DEV EMPOWERMENT  Gives people with R_DEBUG access to runtimelogs.

commit 32de00eed82c0c834a017c067373579afe9a9531
Author: suethecake <suethepyro@gmail.com>
Date:   Sat Feb 22 21:50:21 2014 -0600

    Fix to cloned gun issue - now your holster is located on your tactical armor.

commit b8fdcbb0cd509523870e4500447a8cdf851af3d5
Merge: 92e0c60 e72c584
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 23 07:48:25 2014 +0400

    Merge pull request #4474 from Ccomp5950/say_revert

    say code changes revert.

commit 65b8215ec767640d1cadc03d0e9494fb21875a78
Merge: 056b64c a204a46
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 18:33:43 2014 -0600

    Merge pull request #4465 from Loganbacca/chemsmoke

    Chemsmoke rewrite

commit 056b64c393be87216cb4498f2cd038e220a09406
Merge: b6eacfe bb6f030
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 18:32:36 2014 -0600

    Merge pull request #4466 from Aryn/master

    New ZAS Bugfixes

commit 1bfd86b24c879ba4d13bac6dddf6b538a1686420
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Feb 23 05:09:28 2014 +1100

    Pill Bottle Update

commit bb6f030f84feea4c652f88a3e60d18cba118cd0e
Author: Aryn <aryn@weirdness.com>
Date:   Sat Feb 22 09:09:48 2014 -0700

    Added Reboot ZAS as a debug verb.
     Replaces the air controller, marks all old zones invalid,
     and adds every turf to the update list. Results are the same as on a
     server start.

commit e3b87b4c4d01b55b37c91efdb266a54f1b72ea12
Author: Aryn <aryn@weirdness.com>
Date:   Sat Feb 22 08:47:54 2014 -0700

    Removed a leftover generally-accessible debug verb.

commit 6c91d220b81686ea9b10b228d9049445d9ea1637
Author: Aryn <aryn@weirdness.com>
Date:   Sat Feb 22 08:45:31 2014 -0700

    Added code protecting against obscure merges of invalid zones.
     - Usually happened when welding fuel tanks caused secondary explosions.

commit d6b275ca7381440f2f4f8fbb10778f07c3b3176f
Author: Aryn <aryn@weirdness.com>
Date:   Sat Feb 22 08:16:35 2014 -0700

    Fixed walls not splitting zones.

commit dcc7ad33c912b4a95ce0146aa4b50dc2f3c3b613
Author: Aryn <aryn@weirdness.com>
Date:   Sat Feb 22 08:02:10 2014 -0700

    Zones didn't split when a full window was placed.

commit e72c584ac86818f0954e36d21f8cf7a423ae679c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 03:47:46 2014 -0600

    Reapplys this runtime fix when dead /mob/living would not have a client.

commit 8ef2e1023722882956d86ccb8734b7f2ae579815
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 03:43:37 2014 -0600

    This reverts commit all the say code changes over the last couple of days.

    Except for the removal of the redundant get_mobs_in_view used for bolding ghosts text.

commit 92e0c601260471d5b82d9d91e52fb668b05c26fc
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 02:50:49 2014 -0600

    Remove clients removal derp.

commit cb1c247767a75ffd7c4c6839acc546bba585f2f4
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Feb 22 19:26:42 2014 +1100

    Updates

    Medicine Cabinet(s), Acute Doors

commit d95caffecb62ce0d50d811aabbf0eb7ef25e5588
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 22 01:45:43 2014 -0600

    DEV EMPOWERMENT  Gives people with R_DEBUG access to runtimelogs.

    Also moves make_everyone_random to R_FUN where it belongs, gets rid of that dumb panel from my awesome dev screen.

commit 86c73e242b24aec51c2779aae2fa0b1a336617e1
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 10:16:55 2014 +0300

    Fix for embedding.

commit b251702df107c94ff37ef3de06f0d524ed171e82
Merge: 9a51022 6dc330a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Feb 22 09:10:12 2014 +0400

    Merge pull request #4469 from Ccomp5950/ai_eye

    Runtime in say no good gotta hurry wooo

commit 05c82c970b2f3a7284c4e1f39c49e107b52212b9
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:56:51 2014 +0300

    Tiny fix.

commit 2b9842c113231ebb396ff77835c9eca67d66d520
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:56:12 2014 +0300

    Smallfix.

commit fd738a5767ef808c862c932e943fcd1234630d95
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:54:48 2014 +0300

    Smallfix.

commit b04d00ff7b19e53d497a8f4c52829b8058cf593a
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:54:11 2014 +0300

    Typo fix.

commit ef3b565f6413ccc44c9b185662a148eae3f5288c
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:53:37 2014 +0300

    Fix for #4458.

commit c6d39deac0a34cf30ace6ca063a377f0502e57be
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sat Feb 22 06:49:57 2014 +0300

    Fix for #4445.

commit 6dc330a3988d531466d010e45b58c624431afb19
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 21 21:29:34 2014 -0600

    Bugfix:  get_mobs_in_view won't allow AIeyes to hear chat.

    Also:  Added a client check to saycode for now that stops runtimes when you have a dead body with no client and removed colons from it.
    herp derp.

commit 2689a508df9529e2ff28a1e440971608243a663e
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 08:53:09 2014 -0700

    baystation12.int is the worst thing to happen to version control

commit f511ac20c20c822ef41b78cf77edd457170a066f
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 08:46:56 2014 -0700

    Fixed some debug verbs, removed ZASDBG define.

commit d0c0315d53d9dca24534491f99ad74b4797a2995
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 08:19:12 2014 -0700

    Added documentation, split ConnectionManager.dm, removed some unused procs.
    Added a proc to find the other zone in an edge for future procs.
    Fixed the stupid .int again.

commit 0089ae6282ee932ec66669a03253d1a62e0d25ff
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 07:05:11 2014 -0700

    Fixed some weird bugs concerning space and the creation thereof.

commit f95d0f9a989863ca53d90686f80753f4c144ee8f
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 03:54:45 2014 -0700

    Fixed some zone.remove() bugs:
    Turf should be set back to no gas overlays.
    Debug mode checks if zone actually contains turf
    (might be useful in turf replacement.)

commit f0e4e2782175c132f8190a05b4550f8167b87e05
Author: Aryn <aryn@weirdness.com>
Date:   Fri Feb 21 03:46:30 2014 -0700

    Fixed a special case with simulated turfs being replaced by space.
    Actually any unsimulated turf, but mostly space.

commit bae9fad90b403ec78c23db876ba4747b6beee686
Author: Aryn <aryn@weirdness.com>
Date:   Thu Feb 20 17:14:01 2014 -0700

    Added Z-level support for ZAS, disabled by default to save CPU.
    - Use #define ZLEVELS or uncomment it in _docs.dm to turn it on.

commit 4c27af0bb9cfc2727d4c6c261600ae9d094ab114
Author: Aryn <aryn@weirdness.com>
Date:   Thu Feb 20 17:08:13 2014 -0700

    Added Z-level support.

commit a204a46f4bfdc60e9cdbc791a93c9f4b7dab87e9
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 22 01:07:45 2014 +1300

    Runtime fix

    - Fixed a runtime caused by effects bumping disposal chutes.

commit f593232aa5e6107225735b7a0c9a0da56bbc5d02
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 22 00:56:12 2014 +1300

    Reagent reaction_mob/turf tweaks

    - Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
    - Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
    - Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
    - Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
    - Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.

commit 864e097e917672538c05b2ffc85088fd7223d578
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 22 00:47:08 2014 +1300

    Chemsmoke rewrite

    - Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
    - Moved it into it's own file since it's a little longer than the old one code-wise.
    - Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

    Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
    - Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
    - The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
    - The carried reagent has more volume the closer you are to the centre of the cloud.
    - The visual smoke effect scales with how big the affected area is.

commit 18cc56c002cbc2e46ee78a4816db6ca55c01825a
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 20:19:54 2014 +1100

    Medbay Map Commit to Latest Dev Map

commit 28b84ce8b87b6eb66eb558fdff8cf32bb60cc4eb
Merge: 48d881a b6eacfe
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 20:01:33 2014 +1100

    Merge remote-tracking branch 'upstream/dev' into dev

commit 48d881afc5cf95aa2a47be6b268b09a3133d1ded
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 20:01:22 2014 +1100

    Update to Latest Map

commit 9a510221b0597386a38890660b88663e55426269
Merge: fac3b8c 440f784
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 21 02:13:58 2014 -0600

    Merge pull request #4463 from Ccomp5950/hopefully

    Bugfix:  People unable to hear while in certain locations.  (And some debug verbs)

commit 440f784c703558779619e922bb23f0ffa36c7818
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 21 02:11:11 2014 -0600

    Bugfix: People unable to hear while in certain locations. (And some debug verbs)

    ...hopefully

commit db76f164feb1d7643691d05472f64f6beca112d2
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 18:17:15 2014 +1100

    Revert "derp"

    This reverts commit 77072625dd8b4b8b245a2539eb7c60302371e159.

commit 77072625dd8b4b8b245a2539eb7c60302371e159
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 18:17:09 2014 +1100

    derp

commit 67ec7739c52b55b9191dd0b9c4f8c6adc97e56ed
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 21 18:06:05 2014 +1100

    Tweaks

commit b6eacfe3857dfe9e787238054852ac22112d5ff3
Merge: 9424a5f 63a0f11
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 20 19:23:16 2014 -0600

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

    Conflicts:
    	code/modules/admin/verbs/mapping.dm

commit 9424a5f0bbfc1f3687aaaa1d99e41add2a160173
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 20 19:20:53 2014 -0600

    REVERT baystation12.int

    I messed up and merged a PR that changed this file.

commit 63a0f1185ec7079d2e4cf73b0d2684ee9d363a45
Merge: e0f26b1 fac3b8c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 20 19:16:23 2014 -0600

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

    Conflicts:
    	code/ATMOSPHERICS/pipes.dm
    	code/game/dna/genes/powers.dm
    	code/game/objects/items/devices/PDA/PDA.dm

commit e0f26b11ee9846407ab7b1e1bb9ee79e03a1cb50
Merge: 485af51 da3d82c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 20 18:47:50 2014 -0600

    Merge pull request #4462 from Loganbacca/freezefix

    Dev-freeze fixes

commit d87b558856167a3e553da774d88bc2fd576488dd
Merge: 2a28269 ebf1b49
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 20 18:42:07 2014 -0600

    Merge pull request #4461 from Aryn/master

    ZAS Upgrade

commit da3d82c1deadce7018cc06af9014440ee2190701
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 20 17:54:27 2014 +1300

    Closet fixes

    - Fixed a few closets not adding items to their contents at round start (wardrobes have the same issue, but I've already fixed them on master)

commit 6c7307694dbd8e972515e0d81a8e4145ab5e4737
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 20 17:53:18 2014 +1300

    Map fix

    - Added an extended capacity emergency tank to the CE's locker

commit e140998f86768a25fd6a0f3d159073b453931c2e
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 20 16:46:43 2014 +1300

    Pipe painter bad-fix revert

    Oops. Thanks Segrain.

commit 8fd037820bbe6d29e7e7b474d49ba13982953ceb
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 20 15:59:10 2014 +1300

    Map fixes

    - Fixed lighting issues in dorms (added APC to bedroom area, also gave cryo storage and dorm bedrooms their own area subtypes so light switches don't conflict anymore)
    - Fixed 0-2 cable "pixel_y = 1" offset (it was making a 1 pixel gap between south-to-end cables on the map)
    - Replaced research outpost piping with new subtypes
    - Fixed a broken air supply pipe running to the research outpost auxiliary storage area
    - Replaced a few plating turfs in space with airless platings

commit f451fd42c133a7151d0da03b0446564595432d9a
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 20 15:50:12 2014 +1300

    Pipe tweaks

    - updated update_icon() for pipes and manifolds to change the color instead of the sprite
    - updated subtypes to use global defines for colors instead of hard coded html refs
    - added an alpha tweak to hidden pipes for the sake of mapping (DM doesn't render semi-transparent icons correctly, but it does handle var/alpha tweaks) - this is overridden when the pipe is spawned in the game world with New()
    (Thinking about it, we could potentially do away with the transparent pipe sprites by just using the alpha variable. May do this later.)
    - fixed pipe painter
    - unwrenched pipes now inherit their source pipe color, and also inherit it when reattached to a pipe network again

commit ebf1b494960eb16391c040754cdd66da45658613
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 18:51:22 2014 -0700

    Forgot the changelog.

commit c9b9b1880737efb90a58e0848504f4735d9304f5
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 18:27:05 2014 -0700

    Removed debugging flag.

commit 6fbe320f88caed4645e86898e75173c2676e5897
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 18:26:04 2014 -0700

    Fixed bugs pertaining to connection updates.
     - Unanchored windows did not split zones.
     - Phantom connections left behind by closed doors.

commit 0814bdb36f0c92a6280ee5770b6bbb068b519eb7
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 18:24:37 2014 -0700

    Added some documentation.

commit a2d992ef5ca594ce969f06afd38d8b41fa034b4d
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 17:11:09 2014 -0700

    Fixed inexplicable reversions.

commit 83fdc0942cb0b46373db19760e416b0cc2be4532
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 16:56:53 2014 -0700

    Completed arduous process of standardizing new code.

commit bc971b01ea49e56765653e4fc0dd37fce281f465
Author: Aryn <aryn@weirdness.com>
Date:   Wed Feb 19 15:20:05 2014 -0700

    New ZAS version, stable and efficient. Git broke the everything so it's in one commit.

commit fac3b8c580fd73235df4e4f681eaa2770c207e5d
Merge: 0080e1f 04a0537
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 19 16:49:54 2014 +0400

    Merge pull request #4460 from Ccomp5950/FUCK_recursive_mob_check

    Compile fix / optimizations

commit 04a0537b1fbc9f4d2a923751a0331ff9e527f1b9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Feb 19 00:12:14 2014 -0600

    Compile fix / optimizations

    Removed client check from mob so that if a pAI is being held by a SSD client it can still hear.

    Removed 3rd deep .loc check 2 is plenty, and was making the proc rather expensive
    (if you shove a pAI in a bag and toss the bag into a locker, the pAI will be deaf, you jerk).

commit 0ec00981f886be44a8eea79c5bbb9ec6185c974c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 18 20:00:16 2014 -0600

    Unintended feature/bug.

    Players viewing through security cameras can hear, this is a bit to powerful.

    So removing, it's easy to readd the feature later on.

commit 0080e1f29361366a4fb3a1bc98066c709471f284
Merge: 225b195 0ec0098
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 19 06:00:01 2014 +0400

    Merge pull request #4459 from Ccomp5950/FUCK_recursive_mob_check

    Unintended feature/bug.

commit 225b195934e69ac9a49429409759b6b1ac7369ef
Merge: 2810cfc ec3ae41
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 19 04:25:17 2014 +0400

    Merge pull request #4454 from Loganbacca/bayfix

    Various fixes

commit 2810cfc3cfb1251029976ec3b3d4f547afd53a3c
Merge: 3052a3b af19351
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 19 04:24:31 2014 +0400

    Merge pull request #4457 from Ccomp5950/FUCK_recursive_mob_check

    Code effeciency project: /proc/get_mobs_in_view - hot

commit 3052a3bde7553ba813d20991dae9568f8ea8694d
Merge: 0bd82fa 233ab7b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Feb 19 04:22:55 2014 +0400

    Merge pull request #4451 from JoeyJo0/master

    Fixed #4439 and a small issue in the TCommSat

commit ec3ae41708db2038102aabf25191b5d0556c5093
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Wed Feb 19 12:49:27 2014 +1300

    Mech fab upgrade fix

    Nano manipulators were not lowering build time at all.
    Stock and Pico manipulaors were lowering build time by 6%.

    This fixes that. Now: Stock = standard build time, Nano = 6% faster, Pico = 12% faster.

commit 233ab7b289fade472a59cc165e824c795c8d6acc
Author: Joey Haas <admin@joeyjo0.net>
Date:   Tue Feb 18 18:22:47 2014 +0100

    Fixed the Telecommunications (Server) Monitor showing /list instead of the default network.

commit 1da5d263f2677d5c4fe56fe4e0208fbeaed0a5c6
Author: Joey Haas <admin@joeyjo0.net>
Date:   Mon Feb 17 01:03:35 2014 +0100

    Added myself to the changelog credits.

commit af193516081321c047f766488ac7a6f193fbaacc
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 18 06:51:45 2014 -0600

    Further optimizations, no need to loop through items with multiple istype checks

commit d29a7fb260e9934595dcb02a118c919217d9bbb0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 18 06:47:06 2014 -0600

    pAI / MMI emote fixes.

    Fixes #4191

commit 5909abb08008f43f10179cfbd0d43e5ad7c7d877
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 18 05:40:06 2014 -0600

    This is rather ironic...

    My VERY FIRST PR, I used it to make ghost chat be bold, instead of using viewers() to figure out
    what ghosts could see the mob, I used get_mob_in_view() which sounded pretty descriptive.

    Unfortunately for me it was one of the most CPU intensive ways of determining who could view the speaker for this.

    So yeah, removing the second get_mobs_in_view and replacing it with viewers()

    Yes this code has been in since Oct/Nov time frame :(

commit 4e09cf33acb7046fad417d38fb215f1ece4c21f4
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 18 02:11:59 2014 -0600

    Code effeciency project: /proc/get_mobs_in_view

    Before:  Everytime you say something. This proc is ran.  Along with it, recurses through EVERY /obj/ & /mob/ in view's contents, and EVERY /obj/ & /mob/ in that contents...and once again.

    After:  Fuck recursion, we're going to loop through clients and see if they are within any obj's or mobs within one iteration.  MUCH cheaper, and probably less buggy.

    If someone can't hear everyone and they are within an object and it's not catching?  add it to the list commented for it of type checks.

commit 0bd82fa6e38a44795923753090ec9bf7e67d61ad
Merge: eb593a6 42946bd
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 18 08:33:40 2014 +0400

    Merge pull request #4456 from Loganbacca/bayfix-efficiency

    Code effeciency project: vent pump processing

commit 42946bd2ade1116a5ee4e5d2f0963053918f1d4d
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 18 16:16:10 2014 +1300

    Vent pump efficiency

    - Tweaked the pressure delta check to "> 0.5", so pumps will stop transferring minor volumes of air every tick (because a delta of 3.05176e-005 is still greater than 0). This also reduces the calls to gas_mixture/merge() and gas_mixture/remove() significantly once the air in the environment has equalized.

    The results after running the game for 10 minutes:
    ```
    Proc Name												Self CPU	Total CPU	Real Time	Calls
    /obj/machinery/atmospherics/unary/vent_pump/process		0.035		0.141		0.141		3808	<- before
    /obj/machinery/atmospherics/unary/vent_pump/process		0.014		0.042		0.043		3808	<- after
    ```

commit b8b1bd82a43fa0151bf8be460ac5b1bcd41649df
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 18 11:12:27 2014 +1300

    Wardrobe fix

    Fixes #4447

    - Added a parent call to each wardrobe subtypes New() proc.
    Wardrobes weren't calling obj/structure/closet/New(), so weren't adding items in the same location to their contents when first created.

    - Removed wardrobe/New() proc.
    So all subtypes don't inherit an extra set of blue uniforms and brown shoes. Only one wardrobe on the map is of this type, and it's on the derelict, so didn't think it was worth making a map change.

commit eb593a628f38befbfafc805cdfbf784e8966c0be
Merge: 242aae0 9c5f96c
Author: Mloc <colmohici@gmail.com>
Date:   Mon Feb 17 15:55:29 2014 +0000

    Merge pull request #4449 from Ccomp5950/apc_icon_fix

    Code effeciency project: apc update_icons

commit 242aae0f9718dd5e47ae81d54af9d4ca3d936aaa
Merge: 79683c5 de86587
Author: Mloc <colmohici@gmail.com>
Date:   Mon Feb 17 15:55:07 2014 +0000

    Merge pull request #4450 from Ccomp5950/dna2-everyone_human_fix

    DNA2 fix.

commit 485af511b899347a0f27f3d1aeb323642df103d7
Merge: a7ae5d9 347f406
Author: Mloc <colmohici@gmail.com>
Date:   Mon Feb 17 15:54:13 2014 +0000

    Merge pull request #4453 from Loganbacca/freezefix

    Various fixes

commit 347f4068c641f866fad53c896300ce31da38050c
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 18 00:24:20 2014 +1300

    Various fixes

    - removed double windows
    - added pipe dispensers
    - removed one rogue wire
    - rearranged the atmos monitoring room based on forum feedback
    - changed radiation collector blast doors to same switch network
    - tweaked poddoor New() function so they render over glass if closed at round start
    - setup engine room pipe network to neutralize the SM at round start - it now cools the nitrogen in the chamber
    - added extra functionality to advanced airlock "purge" and "secure" buttons
    - made a few tweaks to airlock/door controller NanoUI

commit 79683c5206c9b8ad8a03f4a09209df2b910886de
Merge: 198b607 47cca1d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Feb 17 03:28:43 2014 +0400

    Merge pull request #4448 from Segrain/master

    Smallfix.

commit 198b607315ca30c127f9a2d6fce0fdc64b2887af
Merge: cf1a35d 71b41e9
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Feb 17 03:26:48 2014 +0400

    Merge pull request #4444 from Ccomp5950/zas_debug

    ZAS_Debug verb.

commit 296e839f03e9f40bb06661e5521e22e1cb4ccf11
Author: Joey Haas <admin@joeyjo0.net>
Date:   Mon Feb 17 00:18:28 2014 +0100

    Fixed issue #4439 (Detomax ignores status of messaging server)

commit de865875cb710be54ccdb3c717aacd09526f6c17
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 14:18:30 2014 -0600

    DNA2 fix.

    Before:  If you shoved a skrell, cat, or any species other then human in the cloner, they came out human.

    After:   Cloning works like it should.

commit 9412850fc3494878ed1dc28f5a5bfac5f022cf8f
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Mon Feb 17 06:50:14 2014 +1100

    Medbay Tweaks

    Tweaks

commit 71b41e9ac7e26de32b74662fb24a1df1e045d521
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 13:31:56 2014 -0600

    ZAS debug_verb runtime prevention.

commit a7ae5d9a6d8840bf5852abb6a5f81aeb4b992841
Merge: 52847ad d213d8cb
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 12:53:57 2014 -0600

    Merge pull request #4432 from RKF45/pdabomb

    Quick fix for PDAs

commit 9c5f96cc58c0bd4396002cd4bb5b9ae58bb3b91b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 10:59:19 2014 -0600

    Code effeciency project: apc update_icons

    Before:  It updated the icons quite a bit at the start of the game.

    After:  It updates more often and quicker, but now it isn't as expensive

commit 47cca1dde8e23727d4eef5063b686ee49fd1e2cc
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 16 18:08:12 2014 +0300

    Fix for #4446.

commit 52847adce6bc84595e64cac60370fef4192a7932
Merge: ef0e07f ce6cd1c
Author: Mloc <colmohici@gmail.com>
Date:   Sun Feb 16 14:24:05 2014 +0000

    Merge pull request #4440 from Ccomp5950/dev-freeze

    Supermatter will stop processing when it's in space.

commit ef0e07f81aac5ca7ccf0435bba1576cca6641140
Merge: 5243250 009b473
Author: Mloc <colmohici@gmail.com>
Date:   Sun Feb 16 14:23:44 2014 +0000

    Merge pull request #4443 from DJSnapshot/dev-freeze

    fixes~

commit db33fb6425b6f406af5fb7c5c935bcf384e95bda
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 02:22:49 2014 -0600

    ZAS_Debug verb.

    Applys a client side only layer of colors over the various zones to show if they are connected or not.

    Green is your current zone
    Blue is adjacent zones that are connected.
    yellow is zones that are connected but not adjacent to your current zone.
    Red is for zones that aren't connected at all.

commit 5243250f2b4157a9f17f6d389a4b9d708335803f
Merge: 3dfb138 5690e2e
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 16 01:55:54 2014 -0600

    Merge pull request #4442 from DJSnapshot/dev-freeze

    Code cleanup for traitors

commit 009b4737afc9da62dcdf8399e5edb669abea9551
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 15 23:54:32 2014 -0800

    fix for semi-annoying typo.

commit 6c030d84f1f72ca22549e5cdad2c7115e4b27834
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 15 23:51:59 2014 -0800

    fix for https://github.com/Baystation12/Baystation12/issues/4438

commit 5690e2e4c7ee2ccc00087d1184ccad744bf63934
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 15 23:42:37 2014 -0800

    Code cleanup for traitors

commit cf1a35d8e3ed33bdeca00209d200a3144972f5e3
Merge: 0e778bc 2d41396
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Feb 16 17:58:37 2014 +1030

    Merge pull request #4429 from Ccomp5950/hide_debug_verbs

    Admin Request:  Hide Debug Verbs

commit f2603777e219735f682c6bee54f90d852540b084
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Feb 16 17:44:08 2014 +1100

    Medbay floor tweaks

commit bf44beff120add57c691c59ee6215e9fc05c8a7a
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Feb 16 15:45:44 2014 +1100

    Medbay tweaks

    minor tweaks

commit 2d413966cc9ad8ece98fba74bda9442c6e1c3b9c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 15 18:54:08 2014 -0600

    Debug verbs are now maintained as a single list

    instead of having to maintain them in multiple places.

commit ce6cd1c1338be4e07210041e411b280d0ba54e9d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 15 17:20:54 2014 -0600

    Supermatter will stop processing when it's in space.

commit 3dfb138514b4151c01a1eeeb474fde214918f6d0
Merge: 2703a10 31c24df
Author: Mloc <colmohici@gmail.com>
Date:   Sat Feb 15 17:59:19 2014 +0000

    Merge pull request #4437 from Loganbacca/bayfix

    Chem grenade fix - again

commit 1ab6ff320ca302fd410e6352797b9c99d2164182
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sun Feb 16 02:29:20 2014 +1100

    medical manual

    Added medical manual (wiki guide), cmo notes on desk & fixed some radios

commit 410b78487968af3b5c0caae1d4fd742475617c39
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Feb 15 22:45:13 2014 +1100

    Medbay Shutters

    Medbay Shutters

commit 31c24df5e8e02dd40a41b40105ed6b5e72fb6c47
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 15 23:30:56 2014 +1300

    Chem grenade fix

    - Restored "steam" code to chem grenades to handle grenades that don't have any reagents in them that react i.e. water grenades. (I removed it thinking it was only in there for handling foam reagents, but it seems it has more uses.)
    This splashes the surrounding area in whatever reagents were leftover in the grenade after all reactions have occurred.

commit bc491d5e82dfe85c473d9b8d97fad254554c9151
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Sat Feb 15 20:25:03 2014 +1100

    Medbay Changes

    CMO Desk

commit 0e778bcdb72c22464aa7ed75a7c539a280bb49c2
Merge: 57607eb 56f61d2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Feb 15 12:21:37 2014 +1030

    Merge pull request #4428 from Ccomp5950/canister_icon_fix

    Code effeciency project:  Canister icon updates

commit d213d8cb80ada4b84614d072e2a0998f66644d84
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Feb 15 02:07:21 2014 +0100

    Quick fix for PDAs

commit 2703a10fd0f6fffdc314f3fdc5880acbafcc712d
Merge: 5648eed 2a28269
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 14 16:46:43 2014 -0800

    Merge pull request #4397 from Baystation12/dev

    0.1.9 Staging (2/14/14) [And I'll form the head!]

commit 2a282693632e784bd6e608521667d55ed635d9c8
Merge: 377d501 054df7a
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 14 16:40:26 2014 -0800

    Merge pull request #4398 from RKF45/pdabomb

    PDA bombs are now more balanced and random.

commit 16e7da35c9906fd5b9d7e221bc63337e3e05c0f9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 14 03:11:52 2014 -0600

    Admin Request:  Hide Debug Verbs

    Gives admins (and devs) the ability to hide the debug verbs after enabling them.

commit 2bc14837d72c897a0dd2b97ca89e55f6b42dcb9e
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 14 20:11:44 2014 +1100

    Medbay Manifolds

    Replaced some medbay manifolds

commit f0eff4f8680d235e9d0388ebfa21fb68605a12ce
Author: Vetinari <kazon_nistrim@hotmail.com>
Date:   Fri Feb 14 19:50:43 2014 +1100

    Medbay Renovation

    Major Medbay Renovation

commit 377d5017cfca1e805e365881b235e6a83c51bfab
Merge: 499e364 d378eb0
Author: Mloc <colmohici@gmail.com>
Date:   Fri Feb 14 08:46:17 2014 +0000

    Merge pull request #4426 from Loganbacca/dev

    Chem grenade fix

commit 57607eb5f7fbe9fec22281132c1090e3115ca75c
Merge: 8e0c06c b392ab8
Author: Mloc <colmohici@gmail.com>
Date:   Fri Feb 14 08:45:54 2014 +0000

    Merge pull request #4427 from Ccomp5950/handle_imbedded_fix

    Code effeciency project: handle_embedded_objects

commit 56f61d2296adac1e5f20be2c9bf10931bee6e634
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 14 02:33:28 2014 -0600

    Code effeciency project:  Canister icon updates

    Before:  If a canister is hooked up to a connector port it's icons were being deleted and recreated every tick.

    After:  We store an update_flag that is a bitfield of the current icon and overlay states, and created a proc to check if it should change.  If not, we don't mess with icons.  Real simple.

commit b392ab8e0e11a8130385e48292572d3294d8a03b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 13 21:56:58 2014 -0600

    Code effeciency project: handle_embedded_objects

    Before:  EVERYTIME someone moved their character this proc would be called and loop through every organ looking for implanted items to see if it needs to apply damage.

    After:  We create a flag that is set when an item embeddes, only when that flag is set do we do that loop through organs upon movement.  Also every 10 ticks while that flag
    is set we will check to see if we need to unset it.

commit d378eb06925cadaf1317afa2001b41f84e41e8e2
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Feb 14 15:44:45 2014 +1300

    Chem grenade fix

    Missed this in my last commit:
    - Added a result amount for chemsmoke so it calculates the created_volume correctly

commit 499e364971a6cf74823015cbbc5960247981f864
Merge: c653c37 d1b37a5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Feb 14 01:35:27 2014 +0400

    Merge pull request #4416 from Loganbacca/foam

    Chem grenade fixes

commit 8e0c06c5415abe5fec8cb4747a52a1cb1ed4b7e4
Merge: 9014f49 87cf8bb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Feb 14 01:32:30 2014 +0400

    Merge pull request #4412 from Ccomp5950/pai-messenger

    pAI messenger bugfix.

commit 9014f499fb3a66397deab6be58ed1c9b43094ba7
Merge: 2ebda59 4f3c404
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Feb 14 01:32:08 2014 +0400

    Merge pull request #4424 from Ccomp5950/ghost-pda

    People in lobby won't see PDA messages.

commit 4f3c404455ac971ee60f6595fab83acd9b836110
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 13 13:03:13 2014 -0600

    People in lobby won't see PDA messages.

commit c653c37586c496eb7d5d4cd565cdb9ad9582519e
Merge: 942ce6e 63a03f4
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 13 13:02:37 2014 -0600

    Merge pull request #4408 from Loganbacca/airlock-merge

    Airlock controller rewrite

commit 2ebda591f063447ae66e64a5c4afe93a81a213a1
Merge: 09bdc94 f0b6c51
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Feb 14 02:22:30 2014 +1030

    Merge pull request #4422 from Ccomp5950/sun_fix

    Code effeciency project:  Sun datum

commit f0b6c51c9d7c32007f6245b24805b82dd7804404
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Feb 13 05:36:46 2014 -0600

    Code effeciency project: Sun datum

    Because of the wrong direction of this sign, every single solar array was being checked for occlusion every tick.

    This should fix that right up.

    Trackers set to update their angle only when the sun does.

    Solar panels set to calculate occlusion every minute (was every tick (though thought to be set to every 6 minutes (36 degrees)), now checks every 6 degrees of sun movement or so)

commit d1b37a539296461f15a3c8ab28833e2dec0ad68b
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 13 17:05:07 2014 +1300

    Fixed cable colors

    - Fixed a couple of lines of code in power.dmi so that cables correctly update their color
    - Fixed the contrast of the cable icons

commit 63a03f4e296060f2ef2a701d37e31681b5143ba9
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 13 14:18:35 2014 +1300

    Airlock update

    - Should now merge

commit d35fbfd562bb8a9742760a6121cbb59678b4d498
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 11 01:07:19 2014 +1300

    Airlock controller rewrite

    - /datum/computer/file/embedded_program moved from embedded_controller_base.dm to code/game/machinery/embedded_controller/airlock_program.dm
    - embedded_controller_base.dm cleaned up and identical parts of the controller subtypes were moved here
    - embedded_controller subtypes moved to code/game/machinery/embedded_controller/airlock_controllers.dm
    - Added nanoUI templates for airlock controllers
    - Added a couple of classes to nano/css/shared.css for colouring buttons
    - Minor map update to maintain airlock compatibility and fix a broken airlock near virology

commit 8fc4e4e7db36884d288bd09007672925c465b2ea
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 11 00:14:58 2014 +1300

    Minor tweaks and fixes for airlock equipment

    - Fixed DP vent pumps not changing direction
    - Made airlock_sensor more versatile (and backwards compatible with old airlock code)
    - Added airlock_sensor and access_button airlock subtypes for easier mapping

commit 02810f7e89c76922e44b02c79b22d304121b0b26
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Feb 13 00:15:02 2014 +1300

    Chem grenade fixes

    Fixes #3986

    - Foam reagent inheritance fixed:
    The trans_to() proc in Chemistry-Holder.dm was calling handle_reactions() every time it would add and remove reagents with add_reagent() and remove_reagent(). I've added a safety flag to both of these procs (and copy_to()) so that trans_to will not call handle_reactions() until it has added all the reagents to the target container. This allows foam to reliably take on the properties of other leftover reagents.

    - Fixed a bug in effect_system.dm that wasn't applying reagents from foam to the environment.

    - Tweaked smoke to apply reagent effects after it has stopped moving
    This was causing huge reagent spam at the center of the smoke cloud as it was spawning, since they were being applied every time the cloud of smoke moved. Also changed it to apply the effects 2-3 times at longer intervals (2 seconds).

    - Smoke also only effects tiles in a 3x3 grid now, rather than 5x5.

    - Summary:
    Chem smoke does slightly less damage (if it contains damaging reagents)
    Chem smoke proc calls reduced by 60-70% (significant lag reduction)
    Foam works properly again
    Foam proc calls reduced by 70-80%

commit 09bdc9492a682607b428beb8179a145e493e291f
Merge: 5a52980 caf23de
Author: Mloc <colmohici@gmail.com>
Date:   Wed Feb 12 09:54:13 2014 +0000

    Merge pull request #4410 from Ccomp5950/dna2-cherrypick

    DNA2 Cherry-pick (Dev -> Master)

commit 5a52980dadd3226c153ae17a4782e4c99b878bbf
Merge: 15ca85e 841333b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 18:07:36 2014 -0600

    Merge pull request #4414 from alex-gh/movement_halloss_fix

    Fixed halloss not slowing you down.

commit 942ce6ebc74a1846e7a3e5a7089ec3d11ad7c171
Merge: 05d4a6d 5a52980
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 18:07:19 2014 -0600

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

commit 841333bc300f143e97df33579f4eb8aa32fc4b4a
Author: alex-gh <alexgh@sempto.net>
Date:   Tue Feb 11 18:01:37 2014 +0100

    Fixed halloss not slowing you down

commit 15ca85edf958909088199e20c3f3b51fe07c72b4
Merge: 6121eeb 8ae8949
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 11 17:18:16 2014 +0400

    Merge pull request #4411 from Ccomp5950/pda-size

    NanoUI PDA - Decreasing initial size of the screen.

commit 6121eeb5f5a75a10f2f53237efe6709d56819ec7
Merge: a543b04 62b70bb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 11 16:37:53 2014 +0400

    Merge pull request #4413 from Ccomp5950/ai_toggle_camera

    Bugfix:  AI Camera light toggle

commit 62b70bb8273e53da8badbb17f39576cdd6e9ed67
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 03:20:22 2014 -0600

    Bugfix:  AI Camera light toggle

    Fixes #3676

    Before:  Toggling would get stuck where it wouldn't toggle the camera until you reset your view.

    After:  Camera light toggles, you have to toggle off before turning on a new camera light though.

commit 87cf8bb2197f7e9637b3e9f0b53d4160e656076f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 01:55:32 2014 -0600

    pAI messenger bugfix.

    pAI has to be a special little snowflake and have it's own messenger proc instead of letting a AI-PDA handle it.

    So, updated it with the newest tnote variable functionality so it can participate.

commit 8ae8949b10056d4abb076fab7da1248c8871b6a7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 00:56:42 2014 -0600

    NanoUI PDA - Decreasing initial size of the screen.

    Gonna miss my XBOX-LARGE pda screen.

commit 05d4a6da089b76742d32b5cd448c34d51d86ba5d
Merge: 47083c6 99c0cdb
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 00:27:37 2014 -0600

    Merge pull request #4400 from Loganbacca/re-engineering-merge

    Engineering remap

commit caf23de8059d39024db79cd89b49401524f04890
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Feb 11 00:14:40 2014 -0600

    DNA2 rangebug, if any hair/beard/eye RGB values are 0 it won't encode it into the dna.

    This is a hacky fix and is temporary until I can sit down and figure out exactly why it's not encoding that block of DNA properly.

    The result of it not encoding it into the dna is that if you clone the person they have a random value there that was assigned at round start.

commit 64f83c51ad05ef1608f0a37a14bcf8d53dde6f16
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:52:58 2014 -0800

    And now tested in game, with some fixes.

commit c3623ff882656f337a611de0f39d4a4adacd53bc
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:24:19 2014 -0800

    Fix earlier screwed commit

commit 9d3396406180b3d6cd740a21ccd9361d49cf393c
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:19:52 2014 -0800

    Missed the gene Life() call.

commit fa20b9c2ee198666d4a386aaba2277f14edcaf6a
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:07:35 2014 -0800

    DNA2 Bug Fixes - Part 2 (CHERRY PICK)

    We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

    This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

    This change also messes with the gene activation logic.

    Conflicts:
    	code/game/dna/dna2_domutcheck.dm
    	code/game/dna/genes/powers.dm

commit 108888879188cb45fd739635bdb77ed8e0c2fb7f
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Dec 19 08:15:42 2013 -0800

    DNA2 EPISODE 2: Revenge of the Bugs

    Made after DNA2 hit /vg/'s main server after no one tested anything.

    * Gene activation/deactivation made modular, refactors domutcheck.
    * Standardized genetics disks and injectors a bit in response to buffer corruption issues. (Untested)
    * Lots of major bug fixes.
    * Skin tones fixed.

    Still needs further testing. All I did was mess around with monkeys.

    Conflicts:
    	code/game/dna/dna2.dm
    	code/game/dna/dna2_domutcheck.dm
    	code/game/dna/dna2_helpers.dm
    	code/game/dna/genes/disabilities.dm
    	code/game/dna/genes/powers.dm
    	code/modules/mob/living/carbon/monkey/monkey.dm

commit a543b046fe3d42e3f9b5660f437abe23f7049d69
Merge: af42333 5810970
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 11 06:59:20 2014 +0400

    Merge pull request #4409 from Ccomp5950/ghost-pda

    Ghosts can see PDA messages.  (Redo: PR #4065 lost in merge)

commit 99c0cdb40371b9aff3dc42b703517f980be7e181
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Tue Feb 11 15:52:31 2014 +1300

    Major engineering remap

    Thread with details and map here: http://baystation12.net/forums/viewtopic.php?f=5&t=9569

commit 58109703524bd0191c57ffda282779a9cdb8d6c5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 10 20:42:32 2014 -0600

    Ghosts can see PDA messages.  (Redo: PR #4065 lost in merge)

commit 054df7a28b43d426df83175a315ead0a8e8a11d4
Author: RKF45 <rkf45codes@gmail.com>
Date:   Mon Feb 10 21:14:04 2014 +0100

    Keeping the PDA sane.

commit 47083c63ef52cc3ec63286ea43cfe9251cde5792
Merge: e5194bf d50d49c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Feb 10 15:48:58 2014 +0400

    Merge pull request #4406 from Loganbacca/bullets

    Bullet inscriptions

commit af4233315d800c51167a58107d40ac9a94732e51
Merge: d4aaf25 26f4035
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Feb 10 00:38:01 2014 -0600

    Merge pull request #4405 from Segrain/master

    Bugfixes.

commit 26f40359fce9699cfa405a810b37ff7421cdb498
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 10 01:38:32 2014 +0300

    Fix for unpinning humans.

commit cba6dac06260f831d47c169ea04bc7c72383dbba
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 9 13:34:40 2014 +0300

    Fix for unlocking exploit.

commit 5bead0c183f8dd02f27ea9172c4beedd785e80ac
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 9 13:32:42 2014 +0300

    Adding blood to humans.

commit 8e11dabf96d550308c12a98b31f9ab3eb07a817d
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 9 13:30:28 2014 +0300

    Bloody feet.

commit b4a8c370ba6083fb5644a3458bfe90c01ca15bf1
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 9 13:21:18 2014 +0300

    Colouring before updating.

commit be61c65edd4680ac22fd32ed98ccd553dbbe74cf
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 9 13:12:49 2014 +0300

    Proper indentation.

commit d50d49cedb49c2eb59e54afffe05b9c1efb06616
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Feb 9 22:52:27 2014 +1300

    Bullet inscriptions

    - Can inscribe text into bullets by using a screwdriver on a bullet casing
    - Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
    - Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names

commit e5194bf35640ad050b245173a34f5fcf7a944575
Merge: cf67b34 7793294
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 9 11:33:12 2014 +0400

    Merge pull request #4399 from DJSnapshot/Security

    Switched Security EOD closet to the Actual Security EOD closet.

commit d4aaf250809797330cd40ac0277ad253aa5efb20
Merge: 7dddfc0 9103717
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 9 11:32:15 2014 +0400

    Merge pull request #4402 from Ccomp5950/pda-scroll

    PDA-Nano refresh / scroll fix (Messages/Notes/Records)

commit cf67b347807b62cfb20cb09109aa1442e8f450a5
Merge: b47acbb 677e8a2
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 8 18:18:29 2014 -0800

    Merge pull request #4401 from Ravensdale/APC

    Self-naming APC's! Now even mapped in APC's will rename themselves

commit b47acbbcfbf4150336e5b6abb13ba6821cac51af
Merge: c06840f 64dcb5a
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 8 18:17:17 2014 -0800

    Merge pull request #4396 from RKF45/blob

    Readjusts blob random event

commit 7dddfc08b6ec53a715341e58814de777a23a148b
Merge: 0f60932 b34ceb5
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Feb 8 18:15:55 2014 -0800

    Merge pull request #4403 from Loganbacca/bayfix

    Fixed shrapnel embedding

commit b34ceb5cfd419bbdbbbed7cbfeae415cabd1abb3
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sun Feb 9 14:56:16 2014 +1300

    Fixed shrapnel embedding

commit 9103717268046c4b6464108194132041580cc05c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 8 16:37:20 2014 -0600

    PDA-Nano refresh / scroll fix (Messages/Notes/Records)

    Problem:  NanoUI auto updates, if you have a div with a scroll bar it will automatically scroll to the top.

    Solution:  Remove the set size on these div's that have this issue and let the entire screen scroll instead since that isn't messed with on refresh.

commit 677e8a29c872eac2d224657359cf6254ffd98f9c
Author: Ravensdale <Tri@rdinn.com>
Date:   Sat Feb 8 06:04:33 2014 -0800

    Tweak APC self-naming so they read better when examined or interacted
    with. Thanks Sky for the suggestion and Mloc for the why.

commit 9d1e160a60bf73947bad7c9e17d465faaaafee31
Author: Ravensdale <Tri@rdinn.com>
Date:   Fri Feb 7 21:48:37 2014 -0800

    Self-naming APC's! Now even mapped in APC's will rename themselves
    depending on what zone they're in. Makes more mapping sanity.

commit 60c61bed774ad62eb15f7e7b6ab53442b7bbd4a7
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Feb 7 18:23:49 2014 +1300

    Sprite additions and updates

    - Fixed passive gate sprite (east and west "on" sprites were reversed)
    - Added new Supermatter manual sprite (it glows!)
    - Added some floor variants (loading outline for plating - in yellow and aqua, caution stripes for old floor tiles, and yellow and grey checkered floor tiles)

commit 4b1bb13ace775e933b05e9d3d5fbef1774929f75
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Feb 7 18:16:52 2014 +1300

    Crate and closet updates

    - Added atmos themed sprite for atmospheric technician secure closets
    - Added a second radiation suit to radiation suit closets
    - Added a solar pack crate (because adding crates to the map with this many objects manually is silly)

commit 3978492ca42f3373b1dfa2914028ab78ac144f0d
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Feb 7 18:13:28 2014 +1300

    Removed ID requirement for gas filters

    So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.

commit e26844df126711f0f2912e4df7938284e474d188
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Feb 7 18:07:02 2014 +1300

    New areas for engineering remap

    - Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file

commit 779329455af3d610591350e854b0e1a09a211aa8
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 7 19:27:17 2014 -0800

    Switched Security EOD closet to the Actual Security EOD closet.

commit 2164cb33da2edd915bc5bd6993468e1910193ec6
Merge: bbf72ca 0f60932
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Feb 7 19:23:31 2014 -0800

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

commit 5869a3fc38f1045246bc67c4533ced95d4256be7
Author: RKF45 <rkf45codes@gmail.com>
Date:   Fri Feb 7 23:28:40 2014 +0100

    PDA bombs are now more balanced and random.

commit c06840f614d821ee3d589acd7323c53e85b02d02
Merge: 27dba28 a8d3c06
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Feb 7 13:40:27 2014 -0600

    Merge pull request #4395 from N3X15/dna2

    DNA 2 - Bugfix Roundup

commit 64dcb5a693bdba36e146ee024c4c1ecaa9d2f9b5
Author: RKF45 <rkf45codes@gmail.com>
Date:   Fri Feb 7 19:57:46 2014 +0100

    Readjusts blob random event

commit a8d3c0601b6214dd39b03ed78c4234ca89e6b208
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:52:58 2014 -0800

    And now tested in game, with some fixes.

commit e1e7a798dcafec2a68d9dc4618fb78f991a18bd4
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:24:19 2014 -0800

    Fix earlier screwed commit

commit 54e4c48f7dc56076522845e1237eeb107f995060
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:19:52 2014 -0800

    Missed the gene Life() call.

commit 3121e4fb2d63fed8682ddee3bf8bb5311a8e125a
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 23:07:35 2014 -0800

    DNA2 Bug Fixes - Part 2

    We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

    This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

    This change also messes with the gene activation logic.

commit a290385e5a9c9471661e5a26006b257d995c5a18
Merge: c28aa5c 27dba28
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Feb 6 22:07:23 2014 -0800

    Merge branch 'dev' into dna2

    Conflicts:
    	code/game/dna/dna2.dm
    	code/game/dna/dna2_domutcheck.dm
    	code/game/dna/dna2_helpers.dm
    	code/game/dna/genes/disabilities.dm
    	code/game/dna/genes/powers.dm
    	code/modules/mob/living/carbon/monkey/monkey.dm

commit 27dba28a5487a459fe3dd4726d726f58ca90fa5d
Merge: bbf72ca 0f60932
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Feb 7 13:18:37 2014 +1030

    Merge pull request #4394 from Baystation12/master

    Removes mechs, removes Roboticist, moves exofabs to R&D.

commit bbf72ca824182f8f6a6a7c0fd95bf1bea56eef52
Merge: 8a58652 38f9486
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Feb 6 14:27:11 2014 -0800

    Merge pull request #4391 from DJSnapshot/dev

    Disabled objectives disabled be default.

commit 38f948661dcb88c3b5e840cd70a066205a414811
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Feb 6 14:24:50 2014 -0800

    Disabled objectives disabled be default.

    (Have fun saying that)

commit 8a58652c41380cd3a1eb53b042545910a49a864a
Merge: 0272807 92cc536
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Feb 6 13:43:05 2014 +1030

    Merge pull request #4385 from Loganbacca/pipes-cleanup

    Pipe standardization

commit 0f60932e1cc9fd46116ddd78e673b1dcf8384547
Merge: e073271 9665e8c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Feb 6 13:42:04 2014 +1030

    Merge pull request #4386 from Ccomp5950/mouse_attack_log

    Mouse Attack_Logs disabled.  Admins rejoice.

commit 02728071186c6338b1416632cd0f6672380985d9
Merge: a266274 353ee43
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Feb 6 13:39:11 2014 +1030

    Merge pull request #4389 from DJSnapshot/dev

    Objectiveless Antags and new Uplink options PART 2

commit 353ee43bae285c61a99156468eecdb91269c1e0f
Merge: f1b77d0 64ff444
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Feb 5 18:35:13 2014 +1030

    Uniform.dmi merge resolution.

commit f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Merge: a266274 e073271
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Feb 5 18:34:23 2014 +1030

    Master merge.

commit 64ff444fa78f315c8d50c89a4c4b1bc6d6240424
Merge: 9c803dc a266274
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Tue Feb 4 23:55:27 2014 -0800

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

    Conflicts:
    	icons/mob/uniform.dmi

commit 9c803dc1f60584a1d2e687f2524b87c80fd4baf3
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Tue Feb 4 23:51:34 2014 -0800

    Added the rest of the objectiveless antag types

commit 9665e8c4df1069f8d3d67b3485f21f23164105e3
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Feb 5 00:14:45 2014 -0600

    Mouse Attack_Logs disabled.  Admins rejoice.

    No more mice in disposals spamming the hell out of admins everytime someone flushes items.

commit 92cc536133104bac4e8198745b931c2bf409b077
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Wed Feb 5 15:16:07 2014 +1300

    Pipe standardization

    Cleaned up pipes.dm
    Changed pipe subtypes to the following layout:
    	pipe
    		simple/manifold/manifold4w
    			hidden
    				colour
    			visible
    				colour

    Did a complete pass of the station to standardize all pipes (yes, nearly 2500 changes)
    (Haven't done the research base air and scrubber pipes yet, and atmos will be done with my engineering redesign)

commit e073271f19603902da215601e2eae454a54cf75a
Merge: e7c22c2 2ec8056
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Feb 4 15:22:17 2014 -0800

    Merge pull request #4383 from Iamgoofball/master

    Because we HAVE to define Del() three times

commit 3026a1306aefd8266759b2c0680e6ae437e1699b
Merge: 2c6afaa e7c22c2
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Tue Feb 4 15:10:13 2014 -0800

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

commit 2ec805630e308023346e0c25a96913ae37bfff57
Author: Iamgoofball <iamgoofball@gmail.com>
Date:   Tue Feb 4 11:30:35 2014 -0800

    Because we HAVE to define Del() three times

    /obj/item/device/gps/Del()
    	GPS_list.Remove(src)
    	..()
    /obj/item/device/gps/Del()
    	GPS_list.Remove(src)
    	..()
    /obj/item/device/gps/Del()
    	GPS_list.Remove(src)
    	..()

commit 5648eed3a5126fbbda9572f5963222fbdd95bedd
Merge: 649f777 e7c22c2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 4 01:45:18 2014 -0800

    Merge pull request #4382 from Baystation12/master

    master -> dev-freeze

commit e7c22c28c7077d9b873466c8e7d850715a897ea0
Merge: e9fa9d6 83246df
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 4 01:44:32 2014 -0800

    Merge pull request #4379 from Segrain/master

    Smallfix.

commit a266274ac32690fa245b0c233235281d422afff9
Merge: 9ba4bce 4b8d5c4
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 4 01:44:20 2014 -0800

    Merge pull request #4378 from Segrain/dev

    Dev update.

commit 4b8d5c4f143d3f262c286bdf9f3e6c78b604819f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Tue Feb 4 08:16:06 2014 +0300

    Code cleanup.

commit e9fa9d6329d124c7b9ac74510766e082975ee81d
Merge: 9a4bcc6 39820724
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Feb 3 07:45:39 2014 -0800

    Merge pull request #4380 from DJSnapshot/hotfix

    Fix to Papadrow's custom item.

commit 39820724d26ff4fb52a4fff29c62013c0cdb5332
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Feb 3 07:34:27 2014 -0800

    Fix to Papadrow's custom item dress.

commit 9a4bcc60b43adb319ba4f7f9c43205a5a688d58b
Merge: 3a54d96 35f5348
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 2 23:30:55 2014 -0800

    Merge pull request #4377 from Ccomp5950/ai_announcements_tease

    Commented out the AI Announcement verbs

commit 83246df6d5942ac9c372dc7052bbd6ea7927a1c1
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 07:32:53 2014 +0300

    Fix for #4297.

commit 9ff5776c9f9787f4cc49b316eeec5ceb86e3cdc2
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 05:10:04 2014 +0300

    Pepperspray safety.

commit 1039fc9eaf13bde72c9436a6baee8ac8a9aa4889
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 05:08:08 2014 +0300

    Spray sizes.

commit 54d2a261f3d5219d33eaf95d639535a8382b3f14
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 05:02:18 2014 +0300

    Helper for cycling through list.

commit 6af8f01cab52d1eaf261125f5814087029ab7dea
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 05:00:15 2014 +0300

    Code cleanup.

commit 3ab805f7c95fbadcf65dccf95abc30331bc31a0a
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:55:42 2014 +0300

    Moving flasks into Booze-O-Mat.

commit 4fe85651b604ca452520fc194cdf126b065df043
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:46:47 2014 +0300

    Taperolls for cyborgs.

commit cec9b87289e387f437e79cf314aae0dda4f5aa0f
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:45:42 2014 +0300

    Folder recipes.

commit 55605624eb95a4e708963365e146109066709452
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:43:38 2014 +0300

    Gamemode autovote.

commit fcc4560e92fec3279155676b691e726a62752bfb
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:38:38 2014 +0300

    Displaying delayed time.

commit b7059519c24f23434de734b3370dbeeb3f25b072
Merge: 9ba4bce 743c8ec
Author: Segrain <dldobrolubov@gmail.com>
Date:   Mon Feb 3 04:36:03 2014 +0300

    Merge remote-tracking branch 'upstream/master' into dev

commit 3a54d96b7a8fc17366813ee158acfe8aabb74901
Merge: 743c8ec 70a1c76
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 2 17:22:25 2014 -0800

    Merge pull request #4374 from Loganbacca/bayfix

    Broken heart fix

commit 35f534854ac5bbd74a4e497bb41a0aa191ea35c5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Feb 2 16:57:07 2014 -0600

    Commented out the AI Announcement verbs

    Now the AI won't get it's hopes up that it can have the
    CAPTAIN REPORT TO THE BAR FOR JOHNSON INSPECTION

commit 70a1c768ad1b16273565f9b0d0b3022961c09f77
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Feb 3 00:28:15 2014 +1300

    Broken heart fix

    Code was using a switch with variables in it. This doesn't work.
    Replaced it with an if..else sequence.

    Thanks to the guys from Paradise for finding this.

    Note: this only fixes literal heart problems, it won't do anything for relationship issues.

commit 9ba4bcecdf7b8e0891f842c1f14ea70cf78ed63c
Merge: 0980493 a750ca5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 2 03:20:32 2014 -0800

    Merge pull request #4367 from RavingManiac/dev

    smexy

commit 743c8ec18e512784499972213fb517f76aba1f7e
Merge: 217a826 0e2ff8b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 2 03:12:45 2014 -0800

    Merge pull request #4372 from Segrain/master

    Small fixes.

commit 217a8266b9ac63f864cdf6e14ca20cc64763c84a
Merge: d7d9141 d38af0c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 2 03:09:42 2014 -0800

    Merge pull request #4371 from Ccomp5950/typo_fix

    america is dumb though

commit d7d9141adfef6ad97ffa8813009abe62e768ed66
Merge: 2a93f44 446d36a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Feb 2 03:09:04 2014 -0800

    Merge pull request #4370 from Ccomp5950/metal_fix

    Bugfix:  Misc science, 50 metal, not 5000

commit a750ca5c0da5f19d58edac5c159379e5c9f09e20
Merge: 30915b5 0980493
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Feb 2 16:04:37 2014 +0800

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

commit 30915b5ba42e632dbf894bea90cbb1a76af1936b
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Feb 2 16:04:11 2014 +0800

    Escape shuttle modified after feedback.

    Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

    Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.

commit 0e2ff8b00bc191baf008d4f66ee4993fbf485091
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 2 02:34:30 2014 +0300

    Fix for #4011.

commit 88e7dbb67f2c061b18875f25997b7c1f20d8787e
Author: Segrain <dldobrolubov@gmail.com>
Date:   Sun Feb 2 02:33:53 2014 +0300

    Fix for mods counting.

commit 0980493981153a64941257e8a69f0fd574b26895
Merge: e79fb1d 6bf6f6d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 1 14:58:38 2014 -0800

    Merge pull request #4368 from Loganbacca/prefs

    Character setup underwear rendering

commit d38af0c44b88ad73183790da0448bf5da2fe25f6
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 1 15:25:00 2014 -0600

    Typo fix:  corpotate -> corporate.

    And superfluous U removal 'MURIKA!

commit 446d36af18043aabdc26891d794ad384d5d82863
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Feb 1 15:16:34 2014 -0600

    Bugfix:  Misc science, 50 metal, not 5000

    Was fixed before but probably a bad mapmerge removed it.

commit 5223888f7028c19386216880cc93186e376a0c5f
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Feb 2 03:38:43 2014 +0800

    Replaced fatscape shuttle with sleeker, nicer-looking shuttle.

    Added swall_floor_f5, swall_floor_f6, swall_floor_f9 and swall_floor_f10, which are smooth interior shuttle wall corners. Shuttles modified to use these instead of the blocky corners or two different overlaid turfs.

    Notice board added to engineering.

commit e79fb1d8903c3358d7f0b59f19723b1f3b3f5a33
Merge: 3a913e4 4b6dc4d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Feb 1 05:13:10 2014 -0800

    Merge pull request #4366 from RKF45/dough

    Reintroducing the dough-based cooking system.

commit 3a913e426c2bb138386f0e986b138636be167610
Merge: 0ae6bdf 2be33b8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Feb 1 03:33:54 2014 -0800

    Merge pull request #4360 from RKF45/dev

    I am doing that just for genetecists wearing monkey suits.

commit 0ae6bdfedce9f830a521e1b38c3a92f4702b5a1a
Merge: 79fd66c 1c9b7c7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Feb 1 03:31:11 2014 -0800

    Merge pull request #4362 from SueTheCake/dev

    Visual update of security explosive ordinance disposal suit.

commit 79fd66c68502da0e2ce8b73e3ea39083b24c0dff
Merge: 8c5c5fb 44498dc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Feb 1 03:30:36 2014 -0800

    Merge pull request #4364 from Loganbacca/collars

    Suit collars

commit 4b6dc4d2576f959fcdbf98ba3bfabc8d3787a9b6
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Feb 1 11:16:55 2014 +0100

    Diona roasts needs cooperation for acid

commit 6bf6f6d8491661e3983f050759cfc8b9fdc18167
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 1 17:53:13 2014 +1300

    Added underwear rendering to character setup screen

    Also culled unused underwear names from global_lists.dm

commit 8fbcda2a0b991116846bef42ea01b47f850a1b09
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Feb 1 02:17:38 2014 +0100

    Reintroducing the dough-based cooking system.

commit 44498dc5eb9859d9fae10ba559163cb0b376eff8
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 1 13:30:18 2014 +1300

    Tail rendering fix

    Spotted this while working on collars code
    Moved tail layer before hand layers, so tails don't render over held items

commit c6964b1a1a78f718fac32f630bdf81d257ca3775
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 1 13:25:09 2014 +1300

    Cleaned collar rendering code

    Removed colon
    Removed need for collar variable
    Corrected TOTAL_LAYERS define

commit 2a93f440d404360f1c61b5dd07a3a85abe3cf61c
Merge: 810de4d e72c824
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jan 31 14:43:15 2014 -0800

    Merge pull request #4365 from Ccomp5950/deadchat_sanitize

    Deadchat sanitized so players can't use HTML.

commit e72c824b90ad80896e8d4fe3c672fa40e887aa32
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 31 16:41:12 2014 -0600

    Deadchat sanitized so players can't use HTML.

commit 810de4ddaa57a2b51a302037382e34c8eb80362a
Merge: 3871179 649f777
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Jan 31 12:40:15 2014 -0800

    Merge pull request #4337 from Baystation12/dev-freeze

    0.1.8 Staging [Do not merge]

commit 387117932dee053004f05be2a1c8286bc732e667
Merge: 039b949 ece3556
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jan 31 12:22:04 2014 -0800

    Merge pull request #4363 from Segrain/master

    Smallfixes.

commit ece35561435d2db2292731da08a7de68a492417a
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 16:31:17 2014 +0300

    Smallfix.

commit 4df59faf76a9f69d7ecc5b69c21afd1bb5480472
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 16:28:24 2014 +0300

    Surgery tracking.

commit 93a29c60b39a8fd9f9bcf1836ebf27c7bfe44fdd
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 16:22:31 2014 +0300

    Verb category.

commit 4e17dc0b93d88b0f7f8d84e48143562e5e3aed79
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 16:21:05 2014 +0300

    Sanity checks.

commit 4c87838e6436749b6a4e7064b7fdf4c3f581c41b
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 16:19:22 2014 +0300

    Double call removal.

commit 41dccddbef8523afc1c2efc66dd14f5c686d64be
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Feb 1 02:09:49 2014 +1300

    Suit collars

    Adds a collar overlay above the helmet layer if the suit has one
    Suit needs an identically named sprite in icons/mob/collar.dmi
    Suit also needs 'collar = 1' set in utility.dm

    Trenchcoats are go!

commit 8c5c5fb868855a74050ca741bb4fd5e9ca13d3b7
Merge: f136fa1 649f777
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 31 06:26:20 2014 -0600

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

commit 649f777ee0b342f6c15de57505acedaa22f44b01
Merge: f208f05 dd75f19
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 31 03:34:22 2014 -0800

    Merge pull request #4361 from Loganbacca/bayfix-devfreeze

    Fixed evac shuttle transit layer

commit dd75f190a0f5dd38dbffa06f3b179ebd900370bf
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Jan 31 21:51:12 2014 +1300

    Made shuttle windows prettier

commit 1c9b7c7a2229971b2a4de753a311c59cb60b54fd
Author: suethecake <suethepyro@gmail.com>
Date:   Fri Jan 31 02:47:14 2014 -0600

    Visual update of security explosive ordinance disposal suit.

commit 2be33b87131ad772d01c28e0cfbd8431d0169c77
Author: RKF45 <rkf45codes@gmail.com>
Date:   Fri Jan 31 08:36:56 2014 +0100

    Typo

commit 60521917a8e87806842a1e690593689ee09b75c6
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Jan 31 20:16:59 2014 +1300

    Fixed evac shuttle transit layer

    Because half an evac shuttle turning up at Centcom doesn't look good on the report.

    Also changed the emergency shuttle to unsimulated turf (where the escape pods dock). Breached pods were turning up at the emergency shuttle and depressurizing it.

commit 039b949ea1fd8e56c8c086ae52719a5af62a5c44
Merge: aabec7f b9b6a6d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 17:37:35 2014 -0800

    Merge pull request #4359 from Segrain/master

    Bugfixes.

commit b9b6a6d5be1b3e8b15e45ae71b2076ff24f65100
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 00:31:41 2014 +0300

    Check for verb removal.

commit 9fdd34b1ba5637fa7a0b2bc31314ce3e9218cae3
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 00:28:25 2014 +0300

    Removal of double reporting.

commit 003dd117f2174dd742fb29d362154404002c0cec
Author: RKF45 <rkf45codes@gmail.com>
Date:   Thu Jan 30 22:27:47 2014 +0100

    New preferences

commit 9a70dd3d131d30af7db28b2075561eec2eb17fc6
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 00:25:44 2014 +0300

    Objectives fix.

commit 75c88634f74a421c43ea67c1db3ba1ab1a960c17
Author: Segrain <dldobrolubov@gmail.com>
Date:   Fri Jan 31 00:22:24 2014 +0300

    Definition usage.

commit f208f055348149bd128ef1895aaa617c4ce83eb0
Merge: 975433f cbd73c9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 10:59:38 2014 -0800

    Merge pull request #4356 from Loganbacca/bayfix-devfreeze

    Non-standard dropped item layer bug

commit f136fa1db2d05468c385507123997793cba58408
Merge: 7962bd3 09ac268
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 12:56:23 2014 -0600

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

    Conflicts:
    	icons/mob/mask.dmi

commit 7962bd3277cdc15f22c5d8cf8b2a0cce0567a4cb
Merge: 9f0792a 975433f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 12:44:33 2014 -0600

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

    Conflicts:
    	code/modules/supermatter/supermatter.dm
    	maps/tgstation2.dmm

commit 09ac26818d459e48cb79a258c55c375e7614dd4f
Merge: 9f0792a 549cb52
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 10:33:46 2014 -0800

    Merge pull request #4358 from SueTheCake/armors

    Tactical Armor Storage + Tac Armor REDUX

commit 975433f8983a89e120db006d3bcefd87df15205d
Merge: a05e016 aabec7f
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 12:14:44 2014 -0600

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

    Conflicts:
    	icons/mob/back.dmi
    	icons/mob/mask.dmi

commit aabec7f8a565593ec463f7722ac5986e68ec1c76
Merge: 91f1058 f08e6c8
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 09:46:44 2014 -0800

    Merge pull request #4357 from Zuhayr/master

    Fixes

commit 549cb52fd3562c6ed0618455dc73ce7ff714c2a5
Author: suethecake <suethepyro@gmail.com>
Date:   Thu Jan 30 11:45:36 2014 -0600

    Fixing map file with provided tools.

commit 9f0792ac1ab5ac4676c3e9734bcfe48c85f26358
Merge: 029c86f a2fa476
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 30 09:37:15 2014 -0800

    Merge pull request #4352 from Zuhayr/dev

    Species changes and icons.

commit f08e6c804d250bb0cf6e0a1a3932bf96b10cd139
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 23:33:57 2014 +1030

    Rogue comma, kill it.

commit 2f36fb79bc0a9e0edbdb821881f6eee8c3b8bef5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 23:31:50 2014 +1030

    Fixes #4078

commit 4bb211a7cdae7891d2f9c22ffba5e57ed4d6edda
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 23:31:26 2014 +1030

    Fixes #4107

commit 8850a43dcb986c2cb3f02aa1fcfcef4f22a0daba
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 23:21:00 2014 +1030

    Fixes #3847

commit 851576b4449bfbd6b4e38289259f39be60a632ab
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:46:48 2014 +1030

    Fixes #3907

commit 97442f4727f219f0737416690cf60e0da824a8a7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:31:22 2014 +1030

    Adding Kilakk's fix for #4145

commit 789a144a8f0fd82e67a4e114ea7ad0f46db8035b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:28:47 2014 +1030

    Fixes #4195

commit 65252e174bcc6178a3e61bd124e90851952b379d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:18:01 2014 +1030

    Fixes #4089

commit a8cdbd939b77e63709a2418b425e8527d1f9252e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:10:44 2014 +1030

    Discovered/fixed a division by zero error for standing on the supermatter core.

commit 5039524f905d2265d689a00277e8ee71a43a4bbc
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:07:20 2014 +1030

    Fixes #4219

commit b38e1a71bec01b8cea7525e9d15581253b60cd32
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 22:06:57 2014 +1030

    Fixes #4223

commit bc48240fff693409b2b98a8bda8558054fb5970e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 21:56:33 2014 +1030

    Generalized yank_out_object().

commit 651599a6697447d523507fb10db81225b5ebc726
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 21:35:02 2014 +1030

    Fixes #4306

commit 7a36d1c9bcf19ce46aefd75b91433da670c0dfa2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 21:30:58 2014 +1030

    Fixes #4346

commit eed21f3f5b2a38be510b97e1a929a0d05dfcc9ae
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 30 21:27:44 2014 +1030

    Fixes #4355

commit cbd73c9845bf94f5901e8b5b95de1ceb63e002a3
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Jan 30 23:42:21 2014 +1300

    Fix item drop layer bug

    Similar to the handcuff resisting layer bug.

    When removing an item from your inventory that has associated inventory slots, items that were dropped from the extra inventory slots would be dropped with incorrect layer variables (set to 20 so they were rendered over the UI).
    Now when the extra items are dropped, it calls the drop_from_inventory() proc, which correctly changes their layer back.

commit 48e4b9a6986919a7146bada42f628cf8c6623834
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Thu Jan 30 21:35:38 2014 +1300

    Fix handcuff resist - layer bug

    Fixes #4324

    Resisting out of handcuffs was leaving the handcuffs layer set to 20 (over top of the UI).
    Changed it to use the drop_from_inventory() proc so it handles the drop event correctly.

commit c8709a9d990424254cd4110d46c9212a4dc09462
Author: suethecake <suethepyro@gmail.com>
Date:   Wed Jan 29 18:37:55 2014 -0600

    ugh

commit 6f69e7f821f7b0974a9f3b45164542bf0d161620
Author: suethecake <suethepyro@gmail.com>
Date:   Wed Jan 29 18:15:35 2014 -0600

    Stuff.

commit 029c86fab01075523f0c9b6b81c8f00e36f8ec5a
Merge: 18f95dd 0f8b1b0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jan 29 05:11:38 2014 -0800

    Merge pull request #4353 from Furlucis/master

    Small borer fix

commit a2fa476182a5f0fa37e1744c2e27be1c5ad2861a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 16:41:59 2014 +1030

    Compile fix.

commit a8346c76d7da213040681528897122e233d035a3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 16:06:02 2014 +1030

    Hacky fix for appendicitis in vox/diona/machines.

commit 27033333122f9ebd619100291369259508516741
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 16:05:43 2014 +1030

    IPC tweaks.

commit 4a0fb22530955f25b531eaf771b3024b2234a313
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 16:01:25 2014 +1030

    IPC brain surgery code.

commit f3d0efea876af4fb129eaefdc04870bef9fcca54
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 15:37:08 2014 +1030

    IPC feeding from APCs, IPC lack of reagent processing.

commit 66173043b1cae50f1a9251fdbe96734f6beb0ad2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 04:35:44 2014 +1030

    Actually applied nymph speech and name change.

commit 9301c7293303eed94748982db5adb27ce192d33c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 29 04:31:38 2014 +1030

    Fixing case on some del() calls.

commit 0f8b1b09abd40601a83d46bfe717e212ae3353da
Author: Furlucis <Logman115@gmail.com>
Date:   Tue Jan 28 00:32:39 2014 -0500

    Small borer fix

    Someone forgot an exclamation point and made the check for a lack of
    brain check FOR a brain, making the assume direct control thing not
    work.

commit 69d260a11d239f8114eaeb6ffeef2e2db4c245ff
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 28 16:00:36 2014 +1030

    Preliminary surgery work for IS_SYNTHETIC.

commit 12a08970d7563112a04b6c72390f6e3c5ae1452c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 28 16:00:09 2014 +1030

    Dionaea and machine race icons.

commit c0b91504b4ee59b6363e7af94ad1bf91eecf5a0d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 28 15:59:50 2014 +1030

    Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.

commit ae7ae5a837d668dd0730c812e0369975c92abe5b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 28 15:58:26 2014 +1030

    IPC hairstyles.

commit 18f95dd1a605a745a4bb6b398dc07266219b9614
Merge: b4e8c78 9d7b42f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 27 21:27:14 2014 -0800

    Merge pull request #4351 from Zuhayr/dev

    Dev/master merge.

commit a05e016aae081d4f5ca321dfdfe5d93a0f5458a7
Merge: 6da9f68 431f9e9
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Jan 27 08:58:06 2014 -0800

    Merge pull request #4350 from Loganbacca/dev-freeze

    Minor mapping tweaks

commit 9d7b42f6b6fbb79f1814b07e342bacd44a704133
Merge: 5d02779 91f1058
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 27 20:55:42 2014 +1030

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

commit 5d02779d164a999a304ebfd665cb4365bf973089
Merge: 1fce280 b4e8c78
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 27 20:55:15 2014 +1030

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

commit b4e8c7817ad1dafdbfae0fe6915a2246a2cb64ea
Merge: 84b3512 ada2ba9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 27 02:23:59 2014 -0800

    Merge pull request #4314 from comma/color

    Non-hardcoded(sprited?) colors for wiring

commit 431f9e9fbce3d237e7743b668e52e67cb0f89a69
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Jan 27 14:54:32 2014 +1300

    Little things

    Gave engine room airlock camera x-ray upgrade (so AI can see SMES).

    Locked engine room core access doors.

commit ada2ba9a2fa872bea16ef2d6f86e90b0fd3ec7a5
Merge: 6175ef8 84b3512
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jan 27 02:27:27 2014 +0400

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

    Conflicts:
    	code/modules/power/cable.dm
    	icons/obj/power_cond_red.dmi

commit 84b35122610659886bc440b13568fdd7a37abc5c
Merge: dfec09e 1348433
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 26 09:16:07 2014 -0800

    Merge pull request #4345 from RKF45/misc

    Fixes for my earliest commits

commit 91f10583cbade4c912a84197034ec43824f7ea47
Merge: 68258a3 a3befe9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 26 09:15:15 2014 -0800

    Merge pull request #4347 from Ccomp5950/hidden_admin_name_fix

    Private message fixes.  Stealth-mode / admin != maroon

commit 68258a3b1b0016d3b054424225b262774db25975
Merge: 98cf0e4 ddca656
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 26 09:15:01 2014 -0800

    Merge pull request #4348 from Ccomp5950/rp_revconvert_fix

    RP-revconvert bugfix

commit 98cf0e450fd8cf5c564e5fb300f1c0cd3c1b2e4a
Merge: b6ed93d 50c077c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 26 09:14:48 2014 -0800

    Merge pull request #4349 from Ccomp5950/cryo_fix

    Cryopod icon_state fix.

commit 1fce280da8f6141a0e0c17f620253a359bd33f94
Merge: dfec09e b6ed93d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 26 20:07:02 2014 +1030

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

commit 50c077c09f9dc98d19783fecf1563ef951a9ecf7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Jan 26 01:39:07 2014 -0600

    Cryopod icon_state fix.

    Missing _ in the icon states.

commit ddca6566728a74d65317083fccd277a32e3c0641
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 25 23:36:11 2014 -0600

    RP-revconvert bugfix

    Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
    Instead of EVERY mob type (simple_animals, borgs, etc.)

commit dfec09ebb2ec82e89effc187b1dcc45ea1b40d04
Merge: 6830eba 5709dc2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 25 20:24:49 2014 -0800

    Merge pull request #4342 from Zuhayr/ihategit

    Multiz changes.

commit a3befe993693dfc15a24c8c79542ac9c9906328a
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 25 22:16:58 2014 -0600

    Private message fixes.  Stealth-mode / admin != maroon

    Stealth-Mode Admins won't have their keys show up in the title of private messages anymore (unless the person sending the message is mod+)

    Admins PM's to players will show up as red again.  You are welcome Virgie!

commit b6ed93d3e7a1df663192838253757eb174f0a52e
Merge: 19be50c bb9a37b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 06:16:32 2014 -0800

    Merge pull request #4344 from Ccomp5950/VV_addverb

    Adding Cancel options for Adding Verbs.

commit 1348433babdab3ac18feb342b75be259b9226501
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 25 13:16:19 2014 +0100

    Unchecks tg posters

commit 4ca429fdf338188a3c013b42ed5a56565ed72a73
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 25 13:06:22 2014 +0100

    Actually allowing tiny objects on ears

commit 9d2465169175c9835203bd32a63aca7adf1e682a
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 25 12:05:16 2014 +0100

    Non-ugly beaker examine

commit 0bf042e64a77e179948b4ba41158c3c52fd0cffd
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 25 11:56:27 2014 +0100

    Only costumes that have sprites belong in the crate

commit bb9a37be8c84a9143527f7b75f8cf700c92db910
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 24 23:56:38 2014 -0600

    Adding Cancel options for Adding Verbs.

commit 6830ebadc9a771ca8fedf1c114ee10c3f6405c6b
Merge: 14c2e3f c54f28b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 24 18:52:12 2014 -0800

    Merge pull request #4332 from Faerdan/dev

    NanoUI Gas Cooling/Heating System

commit 14c2e3f612a6706f50366c9b4f720787bd7ff52a
Merge: 16904ec e5433c2
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 24 20:38:29 2014 -0600

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

commit 16904ec5ec69311b55089764963417b3d625c466
Merge: 3d44e90 6da9f68
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 24 20:38:09 2014 -0600

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

commit 5709dc2629a3b0b456fbc98b55d110a7c1a54820
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 04:16:18 2014 +1030

    Fixes so ladders actually connect and function now.

commit 98177f5a33e7af62ef249bf3997b39296a78bd91
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:18:48 2014 +1030

    Compile fix for what I think was a botched merge with Chemistry-Machinery.dm.

commit 6fd5f7dbe8dca4cabed1f85764b70e5eaf366a98
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:18:22 2014 +1030

    Updated .dme.

commit 697cfdb98c7d83a0e77eecca2db80392ed96aa87
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:17:10 2014 +1030

    Compile fix for merged icon.

commit e870d614c2f85c15b53ab86af82774c3f7ed7301
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:15:13 2014 +1030

    Mass correction of controler to controller.

commit d38c190a57e3e09345f245faf7662969005b9543
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:13:56 2014 +1030

    Merged multiz icons into structures.dmi.

commit 3093a00707de79a27bf551169248b2fe9ea0b5d8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 25 03:13:06 2014 +1030

    Renamed controler.dm.

commit c54f28bcd1a5f242dac9857dd5b343aa5fc0d5a4
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Fri Jan 24 11:05:31 2014 +0000

    NanoUI Gas Cooling/Heating Update
    * Fixel incorrect text label in the gas cooling/heating system NanoUI.
    * Added header for gas temperature.

commit c0d5ffd02237ac0eb5df81af1f5649d813031830
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Fri Jan 24 09:56:02 2014 +0000

    Added no-network check to heat_source to fix a runtime if not connected to a network.

commit e5433c25b801bdefc7b9febcab852b18156258dc
Merge: 3d44e90 867d0d6
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 23 22:09:46 2014 -0800

    Merge pull request #4335 from Loganbacca/bayfix

    APC's added to powernets again

commit 867d0d6967488c4979ea45518b392b10d8294b8e
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Fri Jan 24 17:26:33 2014 +1300

    Areas added to powernets again

    Fixes #4328

    New z-level code wasn't handling d1 == 0 cables correctly.

commit ae4d35e354f569e56206728fbebd11c003ae62a7
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Fri Jan 24 00:38:26 2014 +0000

    NanoUI Gas Cooling/Heating System
    * Created Nano UIs for the Gas Cooling System and Gas Heating System
    * Standardized the reference structure for procs (they now use use full paths, instead of relative)
    * Standardized the names of each machine ("gas cooling system" and "had heating system") for both the object and the UI title

commit 6da9f68a7aa4da200b950f6a4e61d3406c83d903
Merge: 8ae4e41 2d25c94
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jan 23 09:07:53 2014 -0800

    Merge pull request #4329 from Ccomp5950/gun_fixes

    Sniper Rifle fixes

commit 3d44e909bd74b3ac841032e44715a64a8a24007a
Merge: 283df26 8ae4e41
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 23 01:39:10 2014 -0600

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

commit 8ae4e41aaa79c9f663ec55ac575dc63bf9a8689d
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 23 01:36:32 2014 -0600

    Derp merge deconflict error I made when merging master into dev-freeze.

commit 283df26fa7bcb966d4e45f088236dc4f1b412f43
Merge: 23f4d34 c028db4
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 23 00:19:01 2014 -0600

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

commit c028db481e8b5707824815367c83f71cc882b167
Merge: b909d8c 8c02e1b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Thu Jan 23 00:05:53 2014 -0600

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

    Conflicts:
    	code/modules/mob/living/carbon/monkey/diona.dm
    	code/modules/reagents/Chemistry-Machinery.dm

commit 2d25c949003e96052eb782b77dde6193f0f6665b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 22 23:46:05 2014 -0600

    Sniper Rifle Zoom proc documentation comments.

commit b260d511fb1556dbfbfed18befa5b859f5caf2c5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 22 23:40:32 2014 -0600

    Gun fixes.

    You die, you are zoomed out

    You have welding equipment on, you can't zoom in.

commit fbcf16241602da0ed4679dd188d48aa5de9164a7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 22 22:40:21 2014 -0600

    Sniper Rifle fix.

    You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

    If you move while zoomed in you automatically zoom out, you lose concentration.

    If the rifle isn't in your active hand you can't zoom in.

commit 84eefc3b31fc3f2f852aae65d3d5a7c6db6e61b7
Merge: 90ce5b2 b909d8c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 22 22:39:16 2014 -0600

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

commit 23f4d34e4b7f55f59ca8c1f94dd4f253e640c96c
Merge: dba1ad0 b314b62
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jan 22 11:50:12 2014 -0800

    Merge pull request #4326 from Loganbacca/enginefix

    Engine room fix

commit dba1ad08198218e951362414604c8b3f5a7719bf
Merge: ebd5045 5a9e8e0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 22 01:09:51 2014 -0800

    Merge pull request #4316 from RKF45/robots

    Fixes for emagging robots

commit b314b62faf48e1a3fc7e1bfd9716a007265ba325
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Wed Jan 22 12:27:51 2014 +1300

    Engine room redesign fix

    Forgot to take the plasma tanks out of the EVA tank dispenser - seeing as there is now a dispenser with only plasma tanks in hard storage.

commit ebd5045c1a23cc125eec5de79a83a5aa786f589c
Merge: 3b26dab 005d72f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Jan 20 09:26:23 2014 -0800

    Merge pull request #4321 from Furlucis/master

    Typo fix

commit 005d72feb4639e06c36b259015675de0316c5c66
Author: Furlucis <Logman115@gmail.com>
Date:   Mon Jan 20 03:20:35 2014 -0500

    Typo fix

    Fixes a reagent recipe.

commit 3b26dab9544987a6b4f8fcaf9230f7d29e5728ef
Merge: 8430e0a d5eb58d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 21:25:19 2014 -0800

    Merge pull request #4309 from LBraindead/dev

    AMEN

commit 8430e0a720771db4fc630f2f4170d923a052deeb
Merge: 5a8eb3c d35c995
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 21:23:45 2014 -0800

    Merge pull request #4319 from RKF45/colour

    Realistic colour mixing

commit 5a8eb3c455eece90963a045b0fa36123c3e3e329
Merge: 0ad12c7 24c6063
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 21:22:45 2014 -0800

    Merge pull request #4318 from Loganbacca/engineroom

    Engine Room Redesign

commit b909d8cf2b4b812db299f8fe77575d8431d2a233
Merge: b8c7aa4 0870844
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 21:22:23 2014 -0800

    Merge pull request #4317 from Ccomp5950/dev-freeze

    SMES fix, AI's can now use them.

commit 08708448988ee91f50d13c414fe8e3454b151b3c
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Jan 19 21:26:15 2014 -0600

    SMES fix, AI's can now use them.

    Thinking this was a typo, though quite honestly I'm not sure why this test
    is even here as distance checks are built into nanoUI but since feradan put it in
    I'm kinda not wanting to remove it.

commit 0ad12c7e72b18878c2530921ca3cc2ba6b2cd11f
Merge: 5948b15 9511ad9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 19 18:58:33 2014 -0800

    Merge pull request #4313 from RKF45/small

    Small

commit d35c9954b6b8fa4252597eb675fdd4e5b36d03ce
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sun Jan 19 21:47:42 2014 +0100

    Rework of colour mixing

commit 24c6063a073f021cedb73cdb8396d7d97d0e11bd
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Jan 20 01:43:20 2014 +1300

    Updated Supermatter user manual sprite

commit 0f4068724b3f6257694b4e7f949717c5add6dbba
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Jan 20 01:42:46 2014 +1300

    Pod door tweaks

    - Added directional pod door sprites
    - Made pod doors change draw layer when they open and close
       - Pod doors draw behind the glass layer when open
       - Pod doors draw in front of the glass layer when closed

commit 0ede7ed9cb36c041ec2a2b293c053aad5ed1daef
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Jan 20 01:39:59 2014 +1300

    Engineering area tweaks

    - Added a few Engineering areas, and moved one from the Rust files
    - Made the "Engineering Storage" area overlay sprite transparent

commit f406dc2b7cebbca25eb7eac6ea14f25e0e9f0e01
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Mon Jan 20 01:37:03 2014 +1300

    Engine room redesign

    - Added monitoring room
    - Changed airlock
    - Moved SMES to engineering bay
    - Fixed a few other mapping errors in the engineering wing

commit 5a9e8e0f307c8e8e3c373694fe4bea28824c28e4
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sun Jan 19 12:16:10 2014 +0100

    Fixes for emagging robots

commit ca4bb831d4eb52ee504d9497e81e4b4945feff3c
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sun Jan 19 12:03:32 2014 +0100

    Debug

commit d5eb58d8d69a4abea9501c905783320fdbf60e85
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sun Jan 19 12:00:22 2014 +0100

    generalized the z-level atmospipes

commit 6175ef80120c59f9d557207eda61fcc5066bc822
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 03:05:48 2014 +0400

    Moved cable definition to cable.dm because what the fuck.

commit 669ae9a1aed5915d3b6158e3d03a580b644fada6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 19 03:02:58 2014 +0400

    Made cables use color var instead of separate icons for each color.
    It allows for wires of ANY color (just set cable_coil var)
    and most importantly
    40 837 958 b - before
    39 506 651 b - after

commit 5948b15ef11cdba968dc7770c7133127e985f5c4
Merge: 350b822 7dd5968
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jan 18 13:51:09 2014 -0800

    Merge pull request #4304 from Furlucis/master

    Visual changes for homunculi and holywater fix

commit 9511ad9c1baabc2b046c03c022a113ceb6b2dabf
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 18 22:18:24 2014 +0100

    Silicate needs to be tested first

commit 5649bb7fe27979d2920428a624f016d5db4ca03d
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 18 22:15:46 2014 +0100

    Various tiny improvements

commit 75e66d546a7849be4db914532de553aad033131b
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 18 21:09:02 2014 +0100

    Rework of colour mixing

commit 908003d42065b8c97f4086138858a6833bd8596f
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 09:29:53 2014 +0100

    Update baystation12.dme

    make my files actually compile properly

commit 1f9716d1f28a8fda1cec5f0661c69ee76d2bb687
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 01:10:18 2014 +0100

    Update disposal.dm

commit ac1f334919be255cd990f5eb1b9cab8d8fb33ca5
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:37:52 2014 +0100

    Update Turfs.dm

    open space

commit 6cef89777ddb4ed387a8555f6c2a397b3276602d
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:37:22 2014 +0100

    Update Structures.dm

    stairs and ladders

commit e9838702ff4aa500ff4ad09b8e7928b6719031d9
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:36:46 2014 +0100

    Update Pipes.dm

    add up and down pipe

commit b7c502152c97f3750cf02d7adf4ba9c1239711ce
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:36:14 2014 +0100

    Update Movement.dm

    jetpack movement

commit d106e70b028a568c413301b91fa7368aa1ecf1b0
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:35:36 2014 +0100

    Create controler.dm

    z-level controler

commit bbe01a80e64a657d6766f554a7b71720cc433584
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:33:41 2014 +0100

    Update explosion.dm

    transfer explosions accross z-levels

commit 38794771516918fed4636238818204ac3cec01c6
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:32:06 2014 +0100

    Update disposal-construction.dm

    new pipe construction

commit f3240073dc2d310bf7a8b0fa7da75d9f7ecfd7cf
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:31:27 2014 +0100

    Update disposal.dm

    new disposal pipes

commit 8592fdb9534b034e5079a2eaffb7f6cdf22be948
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:30:06 2014 +0100

    Update pipe_dispenser.dm

    dispensing new pipes

commit f653216cde52a2f266ae3d8b8bf3664ca480045f
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:29:18 2014 +0100

    Update construction.dm

    dispensing new pipes

commit ca2de46bc824dbdf89ca5b86d60e58196c8a93ee
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:28:20 2014 +0100

    Update turf.dm

    preventing space being made and immediately changed to open space

commit 4bccee98ba880807ed34f7807b9fc731600b8097
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:20:22 2014 +0100

    Update power.dm

    powernet connection for z-levels

commit cfcb3e65cd9d6c1bf559f31b78b468b55e8c629d
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:19:08 2014 +0100

    Update cable.dm

    cable construction

commit 9d618b2a11361bb3e0617c2abe6253df61957e16
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:16:14 2014 +0100

    Update lattice.dm

    allow lattices to exist on open space

commit f58487a0e9a944059dfbf303726253f00bb6fe49
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:14:01 2014 +0100

    Update ZAS_Zones.dm

    ZAS adjustments

commit d1874bec2e4c3f24545ce1ddbe9fbbb0e18c94d2
Author: LBraindead <raikohelm@gmx.de>
Date:   Sat Jan 18 00:10:39 2014 +0100

    Update Functions.dm

    ZAS adjustments

commit 042c9c5994ec23e23017d9ca8883b0f106bfe204
Author: LordBraindead <Lord.Braindead@t-online.de>
Date:   Sat Jan 18 00:08:21 2014 +0100

    cable and disposals icons for multi-z

commit 7dd5968f76deea13f332e3e607754b6d94d38df8
Merge: 88181a8 350b822
Author: Furlucis <Logman115@gmail.com>
Date:   Fri Jan 17 03:05:04 2014 -0500

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

commit 88181a8057b0d0cc9dde9b9f6ce5cb4f96b4e391
Author: Furlucis <Logman115@gmail.com>
Date:   Fri Jan 17 03:00:32 2014 -0500

    Tweaks homunculi

    Makes them a bit creepier, and makes it so they don't spawn with
    underwear. Because really, if the rune spawns anything, it should be
    robes. But that would make things too easy.

commit 5268e4f2995932bbf3953c4284d705c768555147
Author: Furlucis <Logman115@gmail.com>
Date:   Fri Jan 17 02:57:47 2014 -0500

    Removes the second holywater

    Deletes the second kind of holy water that doesn't do anything. Lemme
    know if I should do the opposite of this.

commit 350b8229af6addb253feff1e3b73d2b47685fb0d
Merge: 8a179a8 1f7cbfb
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 16 02:57:33 2014 -0800

    Merge pull request #4303 from Ccomp5950/supermatter

    Supermatter update.

commit 90ce5b2b69e84362cab37272d025811d26718c56
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 23:42:55 2014 -0600

    SPACE2TAB modules/projectiles/guns/energy/special.dm

    No changes other then space2tab is done in this commit.

commit 1f7cbfbff48dc310f87c0b2b60e2e7e29c532b92
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 20:22:50 2014 -0600

    Supermatter update.

    Now gives an instability% warning in it's messages.

    Limited the "If they can see it and aren't wearing mesons, have some hallucinations" range to a max of 7

    Can't be pelted with lasers while out in space allowing for unlimited power only to drag it back on a turf and instantly explode.

    Removed extra if(!removed) check, we already checked for that above.

    Moved the oxygen ratio variable "oxygen" to be declared under the object instead of it's process proc for easier debugging.

    Changed the alert interval.

    Add luminosity value so the big glowing shard of supermatter actually generates light.

commit 171e63a66fb8f6a2efe55270eafa7262ab278199
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 17:33:13 2014 -0600

    Moved Supermatter.dm out of the WorkInProgress directory.

commit 8a179a8ff10d96181fd3db041058140a6932d710
Merge: dd7fef9 024a0ba
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 15:21:47 2014 -0800

    Merge pull request #4299 from Faerdan/dev

    Canister, Tank & Tank Transfer Value NanoUIs.

commit dd7fef9dc206cfbd5b8651c3be5d20dfa847261b
Merge: f3e53d2 30f2d49
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 14:02:47 2014 -0800

    Merge pull request #4277 from RKF45/paint

    BS12 posters

commit 30f2d49f013508c3f740f02338570a678aa82e3c
Author: RKF45 <rkf45codes@gmail.com>
Date:   Wed Jan 15 22:45:10 2014 +0100

    Quotes inside strings confuse and scare me.

commit 8e510d7fd20ac5ada11cd8b370f07106c04d11d8
Author: RKF45 <rkf45codes@gmail.com>
Date:   Wed Jan 15 22:16:42 2014 +0100

    Uncommitted .int

commit f3e53d20a8311e5b0b0c6d1d6a33ae89728c4c5f
Merge: cb72e02 0a4a7c7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 15 13:05:30 2014 -0800

    Merge pull request #4276 from RKF45/paintmixing

    Mixing paint

commit 024a0baa49df0cb1ec8af4967fefe9d5575453eb
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Wed Jan 15 01:08:45 2014 +0000

    Canister, Tank & Tank Transfer Value NanoUIs.

    * Added Canister, Tank & Tank Transfer Value NanoUIs.

commit 5083e1cd479b91080f4332906714d1ec975cbb04
Author: RKF45 <rkf45codes@gmail.com>
Date:   Mon Jan 13 22:54:47 2014 +0100

    Requested adjustments

commit 0a4a7c7c0807de8befa79dde4c296f18300fe3ad
Merge: b9c747a cb72e02
Author: RKF45 <rkf45codes@gmail.com>
Date:   Mon Jan 13 22:15:33 2014 +0100

    Merge remote-tracking branch 'upstream/dev' into paintmixing

commit b8c7aa44d937a9d34771ec494b18129d1978394d
Merge: e826458 d5bcef4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 13 07:49:16 2014 -0800

    Merge pull request #4291 from Ccomp5950/uplink_fix

    Uplink item spawner fix.

commit d5bcef4f8a936b395ad61dd63d3064834c190cf0
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Jan 12 22:37:00 2014 -0600

    Uplink fix item spawner fix.

    Probably a merge conflict fix or something but some code got moved to an odd spot.

commit cb72e02f237cd9bcae1a0682966d959137f56b69
Merge: f966926 87c246f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Jan 12 16:34:10 2014 -0800

    Merge pull request #4285 from Faerdan/dev

    NanoUI assets are now sent to the client automatically.

commit 87c246ff0661af9d422cc33370ac45377feda080
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 12 23:11:49 2014 +0000

    APC NanoUI

    * Created new APC UI
    * Tweaked Chem Master UI width.

commit f96692601e085e492b3f24f8faea2a4424e3fc96
Merge: 7adb277 e826458
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Sun Jan 12 21:58:47 2014 +0000

    Merge remote-tracking branch 'upstream/dev-freeze' into dev

commit e826458900f4162b27b7060c0260ac4417eaaccd
Merge: 1b582e4 3125911
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jan 12 19:49:49 2014 +0000

    Merge remote-tracking branch 'upstream/master' into dev-freeze

commit c9191faa1454a6345ad96b17e76f1af5e43a22b0
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 12 20:07:48 2014 +0000

    NanoUI Caching and SMES tweaks

    * Made NanoUI caching code neater, added check for directories (which are ignored).
    * Moved SET to between MIN and MAX on SMES UI.

commit 7adb277bae7db62afc22a05f752cf32d7d4239c8
Merge: c46d872 971f210
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jan 12 19:51:38 2014 +0000

    Merge remote-tracking branch 'upstream/dev-freeze' into dev

commit 971f210b43fc46a8b4ed80ffc5352b2166af483c
Merge: 1b582e4 9ae2e42
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jan 12 19:49:49 2014 +0000

    Merge remote-tracking branch 'upstream/master' into dev-freeze

commit c46d872e6c7a1ddda9fd669cb740e4f0da0f2a54
Merge: dfe96b3 9ae2e42
Author: Mloc <colmohici@gmail.com>
Date:   Sun Jan 12 19:46:31 2014 +0000

    Merge remote-tracking branch 'upstream/master' into dev

commit 214fbeee992203d5f74a5e72e05b46d52e87e219
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 12 15:30:25 2014 +0000

    NanoUI assets are now sent to the client automatically.

    * NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).

    Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.

commit b9c747aeaf51246fe80ba5951a43d315a15b8970
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sun Jan 12 12:04:18 2014 +0100

    Makes mixing paints actually make sense

commit 1b582e4a5a3f90a2cfb53cd0b60338bff8c80d16
Merge: 70fe0e0 dfe96b3
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Sat Jan 11 19:25:07 2014 -0800

    Merge pull request #4214 from Baystation12/dev

    Dev freeze staging [DO NOT MERGE]

commit dfe96b37020b493f704fb5c8dda93f90bd179d28
Merge: 7a80f02 5cddea7
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 11 19:15:56 2014 -0800

    Merge pull request #4260 from Zuhayr/sandwiches

    Sandwiches!

commit 7a80f02670cf7e5835e3e6a2c74b409db0f005a4
Merge: 1d6c645 1f50cae
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jan 11 19:04:18 2014 -0800

    Merge pull request #4278 from Faerdan/dev

    SMES NanoUI

commit 1d6c645bc9bea77056e63d09539cef0bd9accd8b
Merge: 83ef93c 167671d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Jan 11 18:48:55 2014 -0800

    Merge pull request #4279 from Ccomp5950/pda_optimizations

    NanoUI PDA optimizations no more sortAtom every tick on every PDA.

commit 83ef93c41c8cd26d2d8b19dba4391d90bd32db33
Merge: bd28c0c df970c5
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 11 18:18:03 2014 -0800

    Merge pull request #4270 from Baystation12/master

    Merge master into Dev

commit 56e4b11ec508c1e9ba08413aae35423d990afcc0
Author: Rob Nelson <nexis@7chan.org>
Date:   Sat Jan 11 18:09:39 2014 -0800

    Dynamic loading of posters
    * Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
    * Fixes wirecutters duping posters
    * Fixes dropped posters not being placeable.

commit 167671d5839b930e6c49b02ea1a0fd3535cb46b4
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Jan 11 20:09:11 2014 -0600

    NanoUI PDA optimizations no more sortAtom every tick on every PDA.

    Should be noticably better on large population servers.

commit 2e903710b069cab0816efb15096a3ec9d85a7edb
Merge: bd28c0c 9e0391a
Author: Rob Nelson <nexis@7chan.org>
Date:   Sat Jan 11 17:58:28 2014 -0800

    Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint

commit 1f50cae6c22ec2bb20bdcba7e553df1cf7864dda
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 12 01:28:03 2014 +0000

    SMES NanoUI

    * Converted SMES to NanoUI.

commit 9e0391af049cbf1f1836821bd79cbb4ec15a31fd
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sun Jan 12 01:42:41 2014 +0100

    Adds Baystation 12-specific posters

commit fabfceaa5ab5602a18ff7be65ec2b1cfc965c5f7
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:50:22 2014 +0100

    Fixed forever!

commit 8758ece58277040ed79bec51a84ee919b1d46aa9
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:42:42 2014 +0100

    Alright already.

commit 140fb2788992c1f16a1d954720a3e029f5374a5e
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:36:35 2014 +0100

    Fixes

commit 8b384b066889110832fef8e5b49608ade8def1bd
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:22:24 2014 +0100

    Various

commit 98834ea3cb67bd4e75b602c5255029dcbafb4a85
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:20:50 2014 +0100

    The costume crate has more than one suit

commit ab8763378b5b3a1937e9daf57806f5aa1e69bcc0
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 11 22:19:02 2014 +0100

    Paint mixing

commit bd28c0c70bba1cf01659cdc30a9a244f6468b16f
Merge: cbcd3d1 4340e4a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 07:54:22 2014 -0800

    Merge pull request #4263 from Furlucis/master

    Talisman icon fix

commit cbcd3d1468f9a7f566e5cefa8c4eb9fc8f3d3e92
Merge: dc271b0 9cae391
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 10 18:47:53 2014 -0800

    Merge pull request #4265 from SkyMarshal/heatfix

    Heatfix

commit dc271b00e1be2c279ce30c02af7cf503a7d69925
Merge: 7dfbc06 adaccb3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 16:35:09 2014 -0800

    Merge pull request #4267 from Zuhayr/dev

    Dev

commit adaccb3c3e15b55979cfc25aed88000279603dfa
Merge: 7dfbc06 e524d21
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 10:45:57 2014 +1030

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

commit 9cae391e0e75bfdd249b58a6173f7351f443ed85
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Fri Jan 10 16:45:59 2014 -0700

    Adds developer-level access to ZAS settings.
    Fixes bug which would always let heat move through doors.

commit ccaef844bfef3151fa812626a4ec37408556e1c5
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Fri Jan 10 16:40:06 2014 -0700

    Fixes derpiness with ZAS heat transfer.

commit 7dfbc0624efd3f278369662649896ef20b1508c4
Merge: 546b9bd 4219b59
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 10 14:10:35 2014 -0800

    Merge pull request #4261 from DJSnapshot/dev

    Replaced modwho and adminwho with staffwho. Fixed Asay colors.

commit 4340e4a6b5a3753942f1c8a1a77b94e58169cecb
Author: Furlucis <Logman115@gmail.com>
Date:   Fri Jan 10 17:09:01 2014 -0500

    Talisman icon fix

    Makes talismans keep looking like talismans for more than a tick.

commit 4219b597b62de07616c5ef1b97b5a1ed571c34a3
Merge: 46c6145 546b9bd
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Jan 10 13:52:07 2014 -0800

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

    Conflicts:
    	code/modules/customitems/item_defines.dm

commit 546b9bded5fa03cb46865a35652a6b482e2b42ee
Merge: 6f01e97 38c0bbd
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jan 10 13:48:11 2014 -0800

    Merge pull request #4259 from Loganbacca/dev

    Multiple map fixes

commit 6f01e971617c47b84e4476db5f26a9be6b9d05e3
Merge: efa5a60 38f47f5
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jan 10 13:47:46 2014 -0800

    Merge pull request #4248 from Zuhayr/dev

    Dionaea changes (microwave recipe, holder procs) and resist verb.

commit efa5a600e3e76c9b32e43d1107ea1af5441b5e39
Merge: 4c1e176 16cc421
Author: Mloc <colmohici@gmail.com>
Date:   Fri Jan 10 13:47:10 2014 -0800

    Merge pull request #4252 from RKF45/ears

    Tiny objects on ears

commit 46c6145cf7eeba0e37aeb29842f84981b613f49b
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Jan 10 13:39:40 2014 -0800

    Made it so asay is not the same color as adminlogs.

commit f911f84bbd363eadb8ceee47b498c255c3f16cd8
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Jan 10 12:49:32 2014 -0800

    Replaces modwho and adminwho with staffwho.

    (Also, stealthfix.)

commit 4c1e17649eb740fb09f09a8b042114bf7d44476e
Merge: 76dc0c4 2b57605
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Fri Jan 10 20:07:47 2014 +0000

    Merge remote-tracking branch 'upstream/master' into dev

commit 76dc0c4c491d72bf7924e821cc1328fabc0be7f0
Merge: 1e4abf7 c6d820b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Jan 10 11:55:33 2014 -0800

    Merge pull request #4234 from Mloc/bs12-quicklist

     [TG] Optimized and refactored list2text, text2list, and replacetext.

commit 5cddea72f083996c8fb3699aa7eaef28a6d408ae
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 02:50:49 2014 +1030

    Colour fix for bread slices.

commit 212eed7e1c6db48f29f4d8257592d21c52acab08
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 02:47:12 2014 +1030

    Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.

commit 68410f98f529d5737ae20a2a5e50d6bcf087cfeb
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 02:35:51 2014 +1030

    Ticked sandwich file that I accidentally included in prior commit. Sandwiches are now a thing that can be made from bread slices.

commit 7653678556aefe75a73c0b224a6e891a54cfcac0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 02:35:22 2014 +1030

    Added sandwich topping and filler mask.

commit 16a28b7338141f39e9a674cfae3d702b2a3eaf7a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 11 02:35:10 2014 +1030

    Added filling_color var to food items for use in sandwiches.

commit 38c0bbd91ad2dcf90ebb40d7d6e15df232671d5e
Author: Loganbacca <wookieemanlogan@hotmail.com>
Date:   Sat Jan 11 01:24:18 2014 +1300

    Multiple map fixes

    Engineering
    	* Fixed Engineering EVA Storage area assignment (was just assigned EVA Storage)
    	* Reconnected scrubber loop to Atmosia through Engineering Maintenance(north of engineering foyer)
    	* Fixed: https://github.com/Baystation12/Baystation12/issues/4254

    Dormitories
    	* Fixed: https://github.com/Baystation12/Baystation12/issues/4232 and https://github.com/Baystation12/Baystation12/issues/4256
    	* Added Cryogenic Storage APC

    IA Office
    	* Fixed: https://github.com/Baystation12/Baystation12/issues/4250

    Bar
    	* Moved Bar mail sort junction so deliveries end up in the actual bar.

    Virology Quarantine Zone
    	* Fixed electrified window wiring
    	* Fixed airless plating in window

    Prison Wing Rec Room
    	* Fixed electrified window wiring
    	* Fixed airless plating in window

    Security Lobby
    	* Fixed electrified window wiring

    Telescience
    	* Removed unnecessary (duplicate) reinforced windows

    Cameras
    	* Aft Primary Hallway - renamed duplicates
    	* Engine Room Airlock - incorrect name
    	* Misc research chamber - removed second camera at north end of room
    	* Secure Armory - renamed duplicate
    	* Prison Rec Room - attached floating camera to wall
    	* Telescience test chamber - renamed from misc test chamber

    Also cleaned up a few rogue unconnected air vents, and a couple of lose cables

commit 38f47f5ae138a0ae4066a90d12ae550618160eab
Merge: 65e6a79 2b57605
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 21:27:15 2014 +1030

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

commit 65e6a79946fab2a10cb7d0bd63ed7287156fbb7b
Merge: 9067680 1e4abf7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 21:26:47 2014 +1030

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

commit 1e4abf785e39054d3fb96ac7e1a1c7ee83654b78
Merge: dfe1884 be153d1
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Jan 9 22:33:28 2014 -0800

    Merge pull request #4237 from Mloc/bs12-tgstuff

    [TG] Lots of small (and maybe not so small) changes from tg.

commit 16cc421e34901fc29c8a5bad234a76f31a8a9332
Author: RKF45 <rkf45codes@gmail.com>
Date:   Thu Jan 9 23:45:08 2014 +0100

    Tiny objects on ears

commit 906768070fe8d2b195854bc65eb4de1854bc74ef
Merge: d3d6294 dfe1884
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 04:15:21 2014 +1030

    Resolved custom_items.dmi.

commit dfe18845be977dcf6a3104fdd6a9c4fe7c7a921e
Merge: 2187916 70fe0e0
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Thu Jan 9 17:42:30 2014 +0000

    Merge remote-tracking branch 'upstream/dev-freeze' into dev

commit 2187916870a81bb1c0aba8b2b03a34a76fa75d3d
Merge: 277d1ba 09c56a0
Author: Mloc <colmohici@gmail.com>
Date:   Thu Jan 9 09:23:25 2014 -0800

    Merge pull request #4246 from ZomgPonies/bs12

    Constructs missing all their abilities -- Taken from /tg/

commit d3d6294ab01f5205d8cd819db16871c9cfe9a0f7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 03:07:17 2014 +1030

    Compile fix, ugh.

commit 331dd3e2865e206a0a190e26238c919778670a9f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 01:58:22 2014 +1030

    Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.

commit 6913c050041cc6ceb4777dec4d210a829c6fcdbf
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 00:30:00 2014 +1030

    Icon looked a bit shitty IG, updated it a little.

commit f23bb5e1fd58d7a0f5e40abb338399527adcc5c9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 00:26:23 2014 +1030

    Roasted diona, for ZomgPonies/Paradise.

commit bef27e5baca1613a86cb9524fa5e6ed27a71cc47
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 10 00:07:26 2014 +1030

    Dionaea (or anything using a holder) can now be microwaved. Mmm-mm.

commit 35d8219bb6152b9b0760cb403a6c728325054674
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 9 23:57:20 2014 +1030

    Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.

commit f51c44cee9e0169ee813dec800e9056605de6b06
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 9 23:56:14 2014 +1030

    Typo and compile fix.

commit 943554242a0080d124d1566a7ce84f4f974f4578
Merge: 70fe0e0 277d1ba
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Jan 9 23:53:34 2014 +1030

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

commit c6d820b04fb9c2281219bf915b4ca65e63eab7b2
Author: YotaXP <yotaxp+git@gmail.com>
Date:   Wed Jan 8 23:03:43 2014 -0500

    Fixed a major bug.  Improved speed further.

commit 09c56a09304320a4e086a4521f8a76c56648e8d7
Author: ZomgPonies <lorden@zomgponies.com>
Date:   Thu Jan 9 04:49:16 2014 -0500

    BS12 compile fixes for Constructs

commit 7829c13c36dacb9d656f92404688540bc2809386
Author: ZomgPonies <lorden@zomgponies.com>
Date:   Thu Jan 9 04:46:27 2014 -0500

    Typo compile fix

commit b4f401e3b64d0feb3908f470e3bb810a5e0438f5
Author: ZomgPonies <lorden@zomgponies.com>
Date:   Thu Jan 9 04:40:37 2014 -0500

    Constructs missing all their abilities -- Taken from /tg/

    Desc of constructs and cult mode promises certain abilities to various
    constructs that were missing. Also fixes some typos.

commit 277d1ba610563609b3ad40ec8d4260345d234491
Merge: 1f779a0 25be74d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 17:49:51 2014 -0800

    Merge pull request #4210 from RavingManiac/dev

    Chapel improvements.

commit 1f779a010bc33455cb7e1d46d65801ef1621d121
Merge: 3259ccf 8e04167
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 17:49:22 2014 -0800

    Merge pull request #4241 from Faerdan/dev

    Minor fix for NanoUI

commit 3259ccf86fc99c19e247d243022e236e22f5a73c
Merge: 5c3d483 8ef5d78
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jan 8 17:22:29 2014 -0800

    Merge pull request #4217 from DJSnapshot/dev

    Custom stuffs!

commit 8e041670e7b9c90cf6261f1c5326cda8a2c5274a
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Thu Jan 9 01:06:24 2014 +0000

    Minor fix for NanoUI

    * I was passing src instead of src_object in try_update_ui, this is fixed now.
    * Changed checks to use the isnul procl, just to be sure.

commit be153d14a328fb53f41a91bd93b4a40385f8479f
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Wed Jan 8 20:32:35 2014 +0000

    Fixes for the tg cherrypicks.

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

commit 363b8e82da6e48252fd3dbddd7f6a8594ff9746d
Author: Giacomand <giacomand@gmail.com>
Date:   Fri Nov 29 20:30:38 2013 +0000

    Tweaked meteors to stop playing unnecessary sounds.
    Made meteors shake the screen more if you're closer and shake the screen of everybody on the station a little (big meteors only).

commit f91b44b47f96d6676b4a9243d758c4250f996c68
Author: Kyrah Abattoir <git@kyrahabattoir.com>
Date:   Sun Dec 22 11:28:10 2013 +0100

    correct paint can names and plural status, corrected pill box names, corrected lockbox names.

commit 98f02be5a64e81726135cb9ce2e992df580df067
Author: Kyrah Abattoir <git@kyrahabattoir.com>
Date:   Sun Nov 24 08:49:34 2013 +0100

    code/game/object/items/weapons/* lowercase pass
    code/game/object/structure/* lowercase pass (start)

    Conflicts:
    	code/game/objects/items/weapons/AI_modules.dm
    	code/game/objects/items/weapons/paint.dm
    	code/game/objects/items/weapons/storage/boxes.dm
    	code/game/objects/items/weapons/storage/uplink_kits.dm
    	code/game/objects/items/weapons/vending_items.dm
    	code/game/objects/items/weapons/weaponry.dm
    	code/game/objects/structures/bedsheet_bin.dm
    	code/game/objects/structures/door_assembly.dm

commit 7315b75cca720eb4e1e90233f0c44b1cc0a11543
Author: Kyrah Abattoir <git@kyrahabattoir.com>
Date:   Sun Nov 24 00:14:46 2013 +0100

    FIXED: inconsistencies with stack item names.
    CHANGE: stacks are gender = PLURAL by default because it fits.

    Conflicts:
    	code/game/objects/items/stacks/stack.dm

commit 2f0a0243e915c5649635b6481cb60ff6d8b0e00f
Author: Kyrah Abattoir <git@kyrahabattoir.com>
Date:   Sat Nov 23 23:41:21 2013 +0100

    code/game/objects/items/robot/* lowercase pass
    NOTE: vision modes have to be proper.

    Conflicts:
    	code/game/objects/items/robot/robot_parts.dm
    	code/game/objects/items/robot/robot_upgrades.dm

commit 691e15bb2fe1b2da6e1ef8791c484c3cadb230ff
Author: Razharas <kostmartin@gmail.com>
Date:   Thu Dec 19 00:01:59 2013 +0400

    Fixes chameleon projector

    Conflicts:
    	code/game/objects/items/devices/chameleonproj.dm

commit 3b66f33d148643bce2e5e6d5b202411032d0a0f2
Author: Razharas <kostmartin@gmail.com>
Date:   Thu Dec 19 00:23:36 2013 +0400

    Fixes morgue trays used by ghosts and what not

commit 1f82a6b55aa9202f6a6263251c46738a74d24033
Author: Razharas <kostmartin@gmail.com>
Date:   Thu Dec 19 00:04:19 2013 +0400

    Fixes beepsky stunning people in things

    Conflicts:
    	code/game/machinery/bots/secbot.dm

commit 3e476a550771de92a102c7133f01165ae232db32
Author: Razharas <kostmartin@gmail.com>
Date:   Fri Dec 20 18:05:06 2013 +0400

    Fixes mechs click through windows and what not

    I ded plz fix

commit 91fa949c3ae88784772258f561857e83cf9d7175
Author: Bobylein <k-knop@gmx.de>
Date:   Sat Dec 21 07:47:47 2013 +0100

    Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot.

    Conflicts:
    	code/modules/clothing/suits/labcoat.dm

commit dda4403e21d5b23cbf3b5e32e5817ff0e2073bc5
Author: Cluwnes Honk <cluwnes@gmail.com>
Date:   Fri Dec 27 15:40:01 2013 -0800

    Succesful fixes
    Fixes instances of "succesful" and "succesfully".

    Conflicts:
    	code/game/machinery/computer/ai_core.dm
    	code/game/mecha/mech_fabricator.dm

commit 65ddc5c88e1e4039c7b08502827bc6ef94e16db9
Author: Cluwnes Honk <cluwnes@gmail.com>
Date:   Fri Dec 27 16:46:00 2013 -0800

    Adds ckey logging to canisters
    Lets admins see the ckey as well as the name of those who toggle release valves on canisters.

commit 5f6a3a01a9ca03c35327dade4f61dd782d210164
Author: rymd <user@nietzsche.fake>
Date:   Sat Dec 28 14:13:30 2013 +0000

    Fixed destructive analyzer failure messages.

commit 2069a9e83c03447235c496ad93a69b941fc613e5
Author: Cluwnes Honk <cluwnes@gmail.com>
Date:   Sun Dec 29 15:54:50 2013 -0800

    Personnelly, I feel this pull request was successfull.
    Spelling fixes.

    Conflicts:
    	code/game/machinery/newscaster.dm

commit 533600eaa52047d59f675d0bff95622d867b6ed7
Author: ChuckTheSheep <chuuckthesheep@gmail.com>
Date:   Sat Jan 4 19:29:17 2014 -0500

    Explosion Optimizations

    Implements a trange that internally checks only turfs and thus less
    intensive.

    Conflicts:
    	code/game/objects/explosion.dm

commit dfdeed74342fb6bae32bd71be97c21026a6b6466
Author: Giacomand <giacomand@gmail.com>
Date:   Sun Jan 5 17:44:46 2014 +0000

    Made the follow verb less buggy.
    Removed duplicated code.

commit 96cf1b050daafa606520209206414d4e1c3a487b
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Tue Jan 7 09:19:59 2014 -0300

    Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell.

    Conflicts:
    	code/WorkInProgress/buildmode.dm

commit 5c3d48302b2c2d87f09acad495540b1158c717e7
Merge: 94829b5 b9335e8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 05:00:51 2014 -0800

    Merge pull request #4235 from Faerdan/dev

    NanoUI fix

commit b9335e88555428afc95bf0033a7c548032f51f31
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Wed Jan 8 12:42:20 2014 +0000

    NanoUI fix.

    * Moved the receiveUpdateData JavaScript into the head so that it's loaded first.

    This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.

commit 794be2b31eca74628f389793e9c6c0da8688687c
Author: Mloc <colmohici@gmail.com>
Date:   Wed Jan 8 11:49:15 2014 +0000

    Fix previous commit for BS12.

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

commit 68ae21fac33617ce86169ffd4c786844d1ef776d
Author: YotaXP <yotaxp+git@gmail.com>
Date:   Tue Jan 7 22:15:25 2014 -0500

    Optimized and refactored list2text, text2list, and replacetext.

    Also fixed some grammar in the station blueprint code.

    Conflicts:
    	code/game/objects/items/blueprints.dm
    	code/game/objects/items/devices/uplinks.dm
    	code/modules/admin/verbs/debug.dm
    	code/modules/clothing/masks/gasmask.dm
    	code/modules/detectivework/scanner.dm
    	code/modules/flufftext/TextFilters.dm
    	code/modules/mob/living/carbon/human/say.dm
    	code/modules/mob/living/silicon/ai/say.dm

commit 94829b552cb06750e7e8886cdaa25e8c8614539a
Merge: 0c48d1b 02d8093
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 02:46:05 2014 -0800

    Merge pull request #4231 from Ccomp5950/pda_fix

    PDA NanoUI Optimizations.

commit 0c48d1b102c4c16d07341bf658c20f7ca1389246
Merge: 3df123d a040cb8
Author: Mloc <colmohici@gmail.com>
Date:   Wed Jan 8 02:37:42 2014 -0800

    Merge pull request #4233 from Zuhayr/dev

    Commit testing? What's that? Single character fix for pulse checking.

commit a040cb8f083830d6b300f39afb81e3b64367a526
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 21:07:10 2014 +1030

    Commit testing? What's that? Single character fix for pulse checking.

commit 02d8093daa2ab14e3457df05bac7a5738ac3e7ad
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Wed Jan 8 02:20:14 2014 -0600

    PDA NanoUI Optimizations.

    Since we no longer have to send data on first UI view we can remove those
    checks and only look at the data we need to send when we need to send it.

    Also fixed a couple of the links on the status display function.

commit 3df123db3855f4596bb3d6cfa895a5a60f9965f8
Merge: a5293d6 901dbd6
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Tue Jan 7 20:12:03 2014 -0800

    Merge pull request #4225 from Zuhayr/dev

    Mixed up some whitelist flags, also added alien reagent reactions.

commit a5293d61540f65a209530ef1da5fbad755b80726
Merge: e136559 e9be0ed
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 7 19:42:14 2014 -0800

    Merge pull request #4229 from Faerdan/dev

    NanoUI Debug Updates

commit e9be0ed44e00cd1f6c7e0f22585c897c4debc20f
Merge: eef5013 e136559
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Wed Jan 8 02:31:03 2014 +0000

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

commit eef5013d79b07476ddb3be9c9bb213ed89a51d2f
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Wed Jan 8 02:30:33 2014 +0000

    NanoUI Updates.

    * Restructured HTML in an attempt to fix the "blank UI" issue.
    * Added a crap ton of debugging messages.
    * Added a loading message to the UI.

commit 901dbd634dd3e000e6fbcdf4763e3142b54c70c6
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 11:13:36 2014 +1030

    Indentation fix.

commit 787da649c140e7cb5593ca6f170d534747cf57a9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 11:05:58 2014 +1030

    Safer way to do the alien thang.

commit e8a5b37ea755c93808283e7624ea805ff67794c4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 10:56:39 2014 +1030

    Fixed some cocked up checks for alien var.

commit c8b595be95f39bc514b75ae28dab64c99d2352ef
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 10:27:21 2014 +1030

    Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions.

commit 049501a898a67949af6574e530480fb71c15c28e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 10:26:39 2014 +1030

    Added some limited support for alien reagent reactions.

commit 1faf2ef25b6fecb544e4511e9eb5c846d0cf863b
Merge: 073dd32 912c04b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 09:42:47 2014 +1030

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

commit 073dd32c37d0641b002158eb6d144240b08a0e30
Merge: a96c17f e136559
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 8 09:42:36 2014 +1030

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

commit 25be74de4897f54ac04c4dbf491cf1deb89a805a
Merge: fe2c98c e136559
Author: RavingManiac <heisen51@gmail.com>
Date:   Wed Jan 8 00:13:20 2014 +0800

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

commit a96c17fd758a49678ec53046f1ec6255bd3d4e05
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Jan 7 20:53:42 2014 +1030

    Mixed up some whitelist flags.

commit e1365598e6af3791812a6587f6fbadd76074d345
Merge: c6f442c 3b072b3
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Jan 6 20:25:12 2014 -0800

    Merge pull request #4213 from Zuhayr/dev

    Significant diona and species flag changes.

commit 8ef5d78b04f6a054ffd3531022ff6c3058e4e944
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 17:21:26 2014 -0800

    stealthfix

commit c6f442cb0c70991c629854a7725fc0be8b2d1325
Merge: 7b2104f cdc8b8a
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 13:21:35 2014 -0800

    Merge pull request #4212 from Faerdan/dev

    NanoUI updates.

commit 7b2104ffef89cd8061f57e9da8a1e316c460c993
Merge: 825f542 a121c30
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 13:18:31 2014 -0800

    Merge pull request #4215 from SueTheCake/master

    Adds missing rifle crate to cargo.

commit dcef3e81e86322345a541ba4dc96dc82e73b6ebe
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 13:15:15 2014 -0800

    Papadrow's custom dress for lillian: http://baystation12.net/forums/viewtopic.php?f=33&t=9363

commit 7ad5b437070e65d33bc1527fb032d196a002e0eb
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 13:06:16 2014 -0800

    Commiting Michael Guess's pendant: http://baystation12.net/forums/viewtopic.php?f=33&t=9367

commit 39c04e06f0f15c7bb3ac7030a28d898e001cf852
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 12:50:30 2014 -0800

    Fix so that custom sprited borgs don't spawn as a cardborg

commit 47ac04af76e917640e073a8f657b6730971a8ac4
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Jan 6 12:50:04 2014 -0800

    Added Watson sprites as per: http://baystation12.net/forums/viewtopic.php?f=33&t=9247

commit a121c306eff885f8521a8bb5ccbc1cffe296c9e4
Author: suethecake <suethepyro@gmail.com>
Date:   Mon Jan 6 00:23:02 2014 -0600

    Fixes~

commit 3b072b32b0ac6733a4e0859682f252cf593a445d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 6 14:54:35 2014 +1030

    More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

commit b28592d707b4bd45b77f5108711356bdcaa5fe02
Merge: d0ac6e6 825f542
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 6 13:42:23 2014 +1030

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

commit cdc8b8a40de3fdd0cf857942f89d3cccd9811c57
Merge: f25052f 825f542
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Mon Jan 6 02:49:50 2014 +0000

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

commit f25052fd4c8bf85ef11f776fe899268daccfdca6
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Mon Jan 6 02:49:25 2014 +0000

    NanoUI updates.

    * Simplified the code used in ui_interact procs and updated all current uses.
    * Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
    * Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

commit fe2c98cf036d5e2dab64222385fb5b098b89eb5d
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Jan 5 22:22:13 2014 +0800

    Chapel improvements.

commit d0ac6e6fff4e84b332b4a9016a76648e195dac8a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 6 00:15:55 2014 +1030

    Forgot a var.

commit 22e325d6ec5203f50e7fc5c749564f212c52dfd3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Jan 6 00:13:49 2014 +1030

    Implemented IS_SLOW.

commit b70a79f853fa8f726b739916efc4b476d6914cdd
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 23:59:39 2014 +1030

    Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.

commit 2a2fffc6162b2dde0c1bc509579fa3d9dda95797
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 23:36:16 2014 +1030

    Fixed a duplicate definition bug with WHITELISTED.

commit 825f54201169e1aed2b522c42c8d4a27524488e7
Merge: c6d7b05 9b62f7b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 02:44:27 2014 -0800

    Merge pull request #4206 from RKF45/fixes

    Small fixes maybe?

commit c6d7b0541a96ccb577111c7641d8f993e84beb5c
Merge: db16435 909c873
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 02:43:52 2014 -0800

    Merge pull request #4209 from Faerdan/dev

    Updated how NanoUI renders templates, using JSRender without the JSViews data-linking.

commit 5940993694591a301ffc8a4618c0eac6fe332430
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 14:20:53 2014 +1030

    Removed a return.

commit 19979562c9bcded50b8d613ef64ee2d54523dfdb
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 14:20:23 2014 +1030

    Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel.

commit b05f81df3d58a44da82089f2662e6bdab3695232
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 14:13:58 2014 +1030

    Added NO_BLOOD checks to drips, syringes.

commit 6fed0c70da5c436ddab1092016d787077ccec773
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 14:06:51 2014 +1030

    Applying NO_BLOOD flag to bleeding code.

commit 28d8109136b63548a3d3050552cd8edf33a26a12
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 13:48:49 2014 +1030

    Added NO_BLOOD and IS_SLOW to dionaea.

commit b0aeb89bd10e2a863d8dddb84db3be7427da7ff2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Jan 5 13:44:17 2014 +1030

    Reusing some unused flags in species.

commit 909c873b2ef9e736fa831af043dff560d0092a18
Merge: 6d9368d db16435
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 5 02:48:44 2014 +0000

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

commit 6d9368d9495106289012d41f008307fd56aa7f30
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sun Jan 5 02:48:15 2014 +0000

    Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
    as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

    I have removed the carets (^) from all templates as they are not used any more.

    For safety I moved the src_object and user checks from the master controller to the nanoui process proc.

commit db164356d8a6137bcd0814e824b2e21d6762cd38
Merge: 61e284c ed5307a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 18:12:06 2014 -0800

    Merge pull request #4202 from fira/dev-ghostanalyzers

    Added Air Analyser verb for ghosts to spy on supermatter and atmos

commit 61e284c0a4e2ceeca500f108ef8626817263777d
Merge: ad740b9 de7c480
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 18:11:58 2014 -0800

    Merge pull request #4201 from fira/dev-ghostradio

    Added GhostRadio -- Allowing ghosts to spy on radio from anywhere

commit 9b62f7b23dc6cb39759a4e3d0b8581a2ae41dc9a
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 4 21:26:28 2014 +0100

    Small fixes, again

commit 9b2ff514865fdaeaec623e0eb39f571ef1aa414b
Merge: 861d987 ad740b9
Author: RKF45 <rkf45codes@gmail.com>
Date:   Sat Jan 4 19:41:19 2014 +0100

    Merge remote-tracking branch 'upstream/dev'

commit ed5307abd06a25e0c55695ba7f690f78d5fa0542
Author: Fira <loyauflorian@gmail.com>
Date:   Sat Jan 4 12:27:07 2014 +0100

    Added Air Analyser verb for ghosts to spy on supermatter and atmos

commit de7c4804395dc7aef8501edbaaafa928e8e23d3d
Author: Fira <loyauflorian@gmail.com>
Date:   Sat Jan 4 12:25:09 2014 +0100

    Added GhostRadio -- Allowing ghosts to spy on radio from anywhere

commit ad740b93973904d1100444e9fb418acc96e29c35
Merge: 1805602 7005a66
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 3 19:33:54 2014 -0800

    Merge pull request #4198 from Zuhayr/dev

    Diona nymphs are now wearable.

commit 18056026b7d77a8f13900febdef7c56a33154715
Merge: d9af451 c1ed93c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 3 19:32:42 2014 -0800

    Merge pull request #4197 from Faerdan/dev

    Fixes/tweaks for NanoUI, updates to new PDA

commit 7005a66d5b2e1e21da27ab4795c14c71f4bd3711
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 13:28:32 2014 +1030

    Fix for containers getting left behind when nymphs grow.

commit fa2b6fa6b4ebb5d366de4354ab2620322e819e61
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 13:23:59 2014 +1030

    Couple of oversights with diona.

commit 47dda54a72c005e940af7647483ece6102b020d5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 12:53:51 2014 +1030

    Forgot SLOT_HEAD.

commit f2300725f77df3425cbb3c3c0eb95b2989b84168
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 12:49:55 2014 +1030

    Made it possible to pick up and wear diona nymphs.

commit 122f5854d65b575b48500ebdaf32dfb704dd3445
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 12:49:15 2014 +1030

    Fix for oversight of dionaea needing to breathe.

commit 2ebd36fffd3c2d5b0320ab295fb5a561abaf981f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 12:48:52 2014 +1030

    On-mob icons for diona nymphs.

commit c1ed93cf29f068e9fc09a39a138c113e7c6b48c8
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sat Jan 4 02:12:18 2014 +0000

    The new NanoUI PDA will now update automatically, eliminating the need for a Refresh button.

    When a user sends or recieves a Message using a PDA, the UI (if open) will now update instantly to show the sent/received message (this uses the new nanomanager.update_user_uis proc).

commit fa085705abd818f98f7a9186836e203145d8644b
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Sat Jan 4 02:09:35 2014 +0000

    Updated NanoUI's nanomanager with update_user_uis and close_user_uis procs. These procs allow you to update and close uis for a specific user and optionally a specific src_object and/or ui_key.

    An example of where the update_user_uis proc will be used is in updating any open PDA UIs for users when sending or receiving messages.

    Added a link to the new NanoUI wiki page in the TemplatesGuide.txt file.

commit 62893f80b63588f07ed9c2e35bacf814b675cd3b
Merge: d9af451 0d77623
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Jan 4 11:35:07 2014 +1030

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

commit a99a7c3dcac09f83d8e159946f608acced96b955
Author: Mark Aherne (Faerdan) <faerdan@gmail.com>
Date:   Fri Jan 3 23:58:44 2014 +0000

    Fixes/tweaks for NanoUI. These were made by TG coders, so I'm just adding them here.

    * Transfer open ui instances when transferring a user to another mob
    * Runtime fixes in the NanoUI Topic and nanoclose client verb
    * Return focus to the map when a NanoUI is opened

commit d9af451d660031019e54bbfe16e5eb598a1b3733
Merge: 1a4e8fa 8ea7931
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 3 09:18:49 2014 -0800

    Merge pull request #4190 from Ccomp5950/merge_fix

    Compile fix after bad merge.

commit 8ea79311c7c5f769d7de5d14a105af4463dbff62
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Jan 3 11:03:39 2014 -0600

    Compile fix after bad merge.

    VERY BAD MERGE, no treats.

commit 1a4e8fafe279cca4b7c9ba3f388e0af1227df800
Merge: 4392c0a a4536a3
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 3 03:27:57 2014 -0800

    Merge pull request #4183 from Iamgoofball/cookie

    Made cookies able to be baked in the microwave.

commit 4392c0a2d39e21450998dbb3fee9ecf5e82248c4
Merge: 345f8e4 ea3ede7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jan 2 18:11:11 2014 -0800

    Merge pull request #4161 from DJSnapshot/dev

    Feature: Popping caps on drinks

commit a4536a3e90d0bf57e687781624b3e79e1237c85f
Author: Iamgoofball <iamgoofball@gmail.com>
Date:   Thu Jan 2 17:15:34 2014 -0800

    Made cookies able to be baked in the microwave

commit ea3ede7e060c6db07f2b7c4b1af553e4fb8b444b
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Jan 2 17:05:56 2014 -0800

    Fixed Cans on the map.

commit 2949c2f6752530bf7559217268d2fcd434c2e927
Merge: b294174 345f8e4
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Jan 2 16:56:38 2014 -0800

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

commit 345f8e4162989da04be9c27fb340d0de678bfe0d
Merge: 4f02578 2c492d8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Jan 2 16:51:50 2014 -0800

    Merge pull request #4181 from Zuhayr/dev

    Fixes from master-> dev

commit 2c492d82895875e01ee73879d74ed4616d3a6bbb
Merge: 4f02578 69f9051
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Jan 3 11:19:40 2014 +1030

    Using DNA2 files from master.

commit 4f025789b73855eeed082c179761972a14a6dfc6
Merge: eec4f69 7a75242
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Jan 1 19:09:56 2014 -0800

    Merge pull request #4149 from Kilakk/dev

    Made nuke ops able to choose their own names on spawn-in

commit eec4f6966f9334af0a41fd5d18cc1d2342bcf303
Merge: 5811678 9e752d7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Jan 1 14:39:14 2014 -0800

    Merge pull request #4172 from LBraindead/patch-1

    Update Fire.dm

commit 9e752d7c79127da47c077e81ec16ce6585b86bb1
Author: LBraindead <raikohelm@gmx.de>
Date:   Wed Jan 1 23:19:27 2014 +0100

    Update Fire.dm

    a bit of rebalancing that should fix the eternal-fire bug

commit 861d98797fc512905ac05ce27ac6fb15fc924659
Merge: 86334cbe 9e4a5b0
Author: RKF45 <rkf45codes@gmail.com>
Date:   Wed Jan 1 22:28:31 2014 +0100

    Merge remote-tracking branch 'upstream/master'

commit 7a75242640e9d5df3083dfacb5fd9f4b55819d96
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Wed Jan 1 13:46:21 2014 -0500

    Where the hell did this even come from?

    I should probably start checking for these things

commit 4a10e9ce39bafdae9cf3ef0128c423f2a7a78287
Merge: c7f840d 5811678
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Wed Jan 1 11:51:53 2014 -0500

    Merge remote-tracking branch 'upstream/dev' into dev

    Conflicts:
    	code/game/gamemodes/nuclear/nuclear.dm

commit 86334cbee23b462379aa3186c2a3121635bb6cc3
Author: RKF45 <geurs@student.chalmers.se>
Date:   Wed Jan 1 17:03:02 2014 +0100

    I have no idea what I'm doing D:

commit b294174acbfd3e051ebff9cfb92f2bd3a0f605f4
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Tue Dec 31 17:52:12 2013 -0800

    Openable soda cans and beer bottles!

commit 581167868aa26898b04aa88433fdc2d28a1f2e8c
Merge: f20a843 56c967c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Dec 31 02:54:59 2013 -0800

    Merge pull request #4158 from Zuhayr/dev

    Dev

commit 56c967c2505e0689cb2e9163c3d0b3ab0bb4758c
Merge: 9e0a1a3 f20a843
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Dec 31 21:24:03 2013 +1030

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

commit 9e0a1a3c0fa02ca4c7a94b8ec3ca5ec19309741c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Dec 31 21:23:11 2013 +1030

    Manual icon merge.

commit da654c80d0b6172f4c2b5d5193ee554a4cd80cdb
Merge: df6bd5d 33de9ae
Author: Zuhayr <AGMogett@gmail.com>
Date:   Tue Dec 31 21:16:20 2013 +1030

    Binary merge conflict, agh. Manual merge incoming.

commit c7f840de733fb29978bb8e8e9f6adafea1cf8320
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Mon Dec 30 15:38:02 2013 -0500

    Fixes #4145, nuke ops can choose their names on spawn-in

commit 5ca939fd391495bfb6ad299239f56b35594a666e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:00:42 2013 +1030

    Nuke starting condition rebalance, op number scaling rebalance.

commit df6bd5d6c8e7f6d6dac6b7c2ea258005832fd313
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Dec 30 21:48:34 2013 +1030

    Gib rewrite/resprite to allow for arbitrary blood and flesh colours.

commit f20a843496cc662cf3db96836c9638a583e7ac3e
Merge: 53c94f7 f14c46c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 16:06:29 2013 -0800

    Merge pull request #4142 from Ccomp5950/pda_optimizations

    Optimizations of PDA NanoUI

commit 53c94f76bd043b49c352ced2a2726e3973f2c3a7
Merge: 4ddf6ad e63d5c1
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 06:25:12 2013 -0800

    Merge pull request #4134 from comma/gunlocker

    Adds gun cabinets - special snowflake secure closets.

commit 4ddf6ad4a1524a1f84646f9431feacf37aac2e7a
Merge: c8ee7d0 154717a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 29 05:54:27 2013 -0800

    Merge pull request #4140 from Zuhayr/dev

    Adds ghost writing, config options, redid blood paths/xenoblood.

commit e63d5c14a5f4e3f1eeb02c95f08df0a145a72a49
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 29 17:52:56 2013 +0400

    BYOND cannot into chain assignment

commit f14c46cc9cc8d4316de053a2f9e292b5936d8e99
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Dec 28 20:56:06 2013 -0600

    PDA NanoUI spam event update.

    Since PDA's track conversations now we won't have a PDA for spam (we could always create a dummy object for it in the future)

    So we don't want it adding to tnote.  Popping up on the players chat is fine for now.

commit da140dd4bb1ed895e21120fa3167d56750d58424
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Dec 28 19:38:14 2013 -0600

    Optimizations of PDA NanoUI

    We don't have to process every function every time, should shrink the JSON
    data pushes as well as sanitize some of the data.

commit 154717aef695b48994e391c1638c0653a066c33d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 04:06:17 2013 +1030

    Actually stopped gibs from being shaded without making their footprints pale.

commit bf820a99b6d3c8d7e509c06eca8afb50758e8d37
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 03:07:20 2013 +1030

    Fixed robot gib display issue, updated single path on map to new path.

commit 5313851da98287543f14c180576b3fd55750d51c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 02:48:20 2013 +1030

    Converted robots over to current blood system/paths, updated various files to work with update.

commit 5d902525cf275b4a893ec875ab41532f7cdab80e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 02:47:46 2013 +1030

    Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour.

commit 73a5efec2a46a8a4b9a3fbeb5d29a9f869d7b541
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 02:32:10 2013 +1030

    Fixed a gib display issue with robots.

commit ca47918e4bdf49281bdd83f33db26a4dd42a1374
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 01:12:47 2013 +1030

    Actually fixed the blood writing runtime this time.

commit be14eb87816965d0d772e8ff5835fa6f4980a7c9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 00:34:03 2013 +1030

    Minor hand blood overlay fix.

commit c8ee7d008b3961ade7c1e4dbff951173033508a7
Merge: 8615b8f da4f884
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 05:57:11 2013 -0800

    Merge pull request #4141 from Ccomp5950/pda_nano_notes

    PDA Nano-UI Fix.

commit da4f884b467a1421e076c5a55c76af4c48847574
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sat Dec 28 07:49:43 2013 -0600

    PDA Nano-UI Fix.

    Fixes the line breaks in notes so it doesn't piss of nanoUI when you have multiple lines.

    Also fixed quotes, this will remove the ability to use less then and greater then in notes but not much I can do about that without
    adding a bunch of replacetext procs encoding and decoding only those items.

commit a17b37ec95e95d3f0754ccb745ad4120bd364df1
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 00:12:53 2013 +1030

    Runtime fix for blood lettering decal.

commit 01dd4373d0fb07937f2510f4652a2c17c603c156
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 00:11:21 2013 +1030

    Minor bugfix with blood painting code.

commit 46bf56f38a9137b40c54ad01c3918fe361d5b5de
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 29 00:03:45 2013 +1030

    Wrong var in ghost writer toggle.

commit 26de46ae4b403bf69d09d64eb2144fbbf95c8979
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:59:47 2013 +1030

    Added ghost writing proc to mob/dead.

commit 85ad2363c40fde16e2704fbc2422d30c20eb1b69
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:53:20 2013 +1030

    Added config toggle for ghost writing (for adminbus).

commit c2f4ff6f1c14182948fa06c86c573c8c36ac1008
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:52:59 2013 +1030

    Reticked head reattachment surgery.

commit 243e7bb981332773ffbd0085947e3ae6b963d506
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:48:56 2013 +1030

    Fixed some removals from the example config. x2

commit 552d8679942bdfb4b21a7c2516243e208a2ed6f4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:47:57 2013 +1030

    Fixed some removals from the example config.

commit 7e5ebe87efb4ede7ddfcb6293f3ec0ecb3e7fb67
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:44:46 2013 +1030

    Attempting to fix .dme issues with raw file from github.

commit df38d75131a55794eea52709b621a6b125437ce1
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:30:23 2013 +1030

    Added config values for ghost writing.

commit 6888651da6346c1637280a5088b49112cc165acd
Merge: 2089fa5 373514f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:14:43 2013 +1030

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

commit 2089fa5900029ffe52ede1e58f4e167765a7ae5e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:14:25 2013 +1030

    Manual binary file merge for ammo.dmi.

commit c6c1a575d69710ab4102660a388b8ad724eede71
Merge: e9e5dd4 1967a17
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:13:04 2013 +1030

    Merge of blood file, ammo icons, map. Manual binary file merge incoming.

commit e9e5dd4ebe70a092f3e13d4355fea27b56e6cd4b
Merge: 31bc392 8615b8f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 23:05:23 2013 +1030

    Map merge resolution.

commit 8615b8f19ad6b25bb038156e0077c670f1995e3b
Merge: 53cbeb9 3f3ae1f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Dec 28 04:27:59 2013 -0800

    Merge pull request #4138 from comma/dev

    Rocket launchers shouldn't probably fit on belt

commit 3f3ae1fad698c40c79598a96f4060aad435955f0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Dec 28 16:25:49 2013 +0400

    Rocket launchers shouldn't probably fit on belt

commit 53cbeb9f8b23cce6396389aad502495b4cc82afe
Merge: acda356 eeeae3d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Dec 28 04:21:01 2013 -0800

    Merge pull request #4136 from DJSnapshot/dev

    Added Sue's new weapon code and sprites

commit eeeae3d2853182204b06ddb1ad82da9290b1609e
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Dec 27 20:23:44 2013 -0800

    fixes because Sue is silly.

commit 1f5e278aa6183d60844fa81d96fc02bde9c9492b
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Dec 27 16:44:44 2013 -0800

    Added Sue's new weapon code and sprites.

commit acda356bc168d88e10f8ac51f62eedc3ddb3b0ad
Merge: a7108ad 630fe9a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Dec 27 11:14:25 2013 -0800

    Merge pull request #4132 from Ccomp5950/pda_nano_fix

    PDA NanoUI template fixes.

commit 630fe9af01799c7665dbd6a7d307e2a7699d6357
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Fri Dec 27 05:22:17 2013 -0600

    PDA NanoUI template fixes.

    Cartrdige name is no longer fixed size causing oddities with really long names (quartermasters).

    Fixed a </span> to not have a line feed in the middle of it making the UI unusable in mode 47 if there are no requests.

    Set the Supply Records to use the same style as Security/Medical Records.

commit a7108ad429fcbc483494f642f2f226df5c25dbdb
Merge: 9df1c47 fafae93
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Thu Dec 26 12:01:33 2013 -0800

    Merge pull request #4121 from Zuhayr/dev

    Arbitrarily coloured blood and footprints.

commit fafae93e7a21a7661e51f690f8c544c26504d2dc
Merge: dd06a71 5068a54
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 07:41:19 2013 -0800

    Merge pull request #4 from comma/rainbowlood

    Fixed rainblowd

commit 5068a54568bf5eb3ab0ad1e89c4f33a886ce8335
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 18:22:40 2013 +0400

    Adds update_icon to drips

commit d920a4651fd943d2e0d28b84d251622b319429c0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 18:16:29 2013 +0400

    Fixed rainblowd

commit dd06a71c9bbfaaa5c74f3acc8992bd993833330e
Merge: da25066 a097c23
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 06:13:32 2013 -0800

    Merge pull request #2 from comma/rainbowlood

    Rainbowlood

commit a097c235edf77a12c94c2322b9f1b9938dc18db4
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 18:12:01 2013 +0400

    Made tracks use colors instead of icon procs too.

commit 25bb796b7f68537da9ceabb414db591d91f97c42
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 17:18:17 2013 +0400

    Added some sanity to brightness proc

commit da250666a318dfb070dc04ed663d66c2eb10b66b
Merge: 8f09b98 57178dd
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 04:46:30 2013 -0800

    Merge pull request #1 from comma/rainbowlood

    Rainbowlood

commit 9df1c47787350421e45e9d8bc514f76577e0c4dd
Merge: 3f59297 82700e9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 04:33:14 2013 -0800

    Merge pull request #4119 from comma/dev

    Fixes #4028

commit 38a8b58ec883598da48aba2178cd0af23bf9cf27
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 16:27:09 2013 +0400

    Replaced weird ass space indenetation with tabs in tracks.dm

commit ff895324024bb4305afcaf85ef95b491b05d7420
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 16:21:17 2013 +0400

    Sets right color for shoes overlay when stepping in blood.

commit 57178dd25199d5df6e46b0a520fd63a70058ee70
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 15:36:25 2013 +0400

    Derp, forgot to change back from debug icon file

commit 3ee2430425c166eb879aabe9d82a05edade78603
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 15:28:03 2013 +0400

    Made blood overlays respect blood color

commit e5699fde0b493d64a63d66a59e82c2297659f12f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 14:38:05 2013 +0400

    Readded dirtying floors.

commit 5191cb4c6c87466b2a9e84fc772381fcccb7fd05
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 14:12:28 2013 +0400

    Made drips use species blood too.

commit a4e2756134bf8373d2b0549c353d813822584436
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 14:06:27 2013 +0400

    Made blood coloring use color var instead of icon operations.
    Updated icons to match (they need to be white instead of black to work)
    Updated some colors to look fine on them.

commit 9d9d6de78d42bbb3b8712d7045910ca6876a3dc3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 13:27:36 2013 +0400

    Stopped robot chunks from drying up like meat ones. It's weird, and makes them pitch black.

commit 1c4c2d32a52e2a44bcf23eb927594e3233655726
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 12:59:09 2013 +0400

    Added helper proc that adjusts brightness of given html color

commit e15d77eba71ad672a80ddfc8bfe4a3d4be9cc89d
Merge: 82700e9 8f09b98
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 11:11:06 2013 +0400

    Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into rainbowlood

commit 82700e9edaeb856d6b4c355589b6f6f376250d26
Merge: 9202fda 3f59297
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Dec 26 11:10:36 2013 +0400

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

commit 8f09b986e39184899eda75d361202f8ab29b02e6
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 17:00:43 2013 +1030

    Whoops, forgot to cleanmap.

commit 0a616b89d3cd826d7ae162096627c14c3b4cd89b
Merge: e89fe94 3f59297
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 16:59:48 2013 +1030

    Manual map merge.

commit 3f5929777b51b8b981c166d391a5a452da5f41ba
Merge: 1311cf0 43acfd6
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 22:20:56 2013 -0800

    Merge pull request #4118 from fauxki/dev

    Potted plants & shuttle windows.

commit e89fe94af8f4c656fd2ce17a753b539a5d5fa66a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 14:48:05 2013 +1030

    Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.

commit d97180239b214f925852ecf3de06fde78bab2446
Merge: d9a0f49 1311cf0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 13:46:12 2013 +1030

    Using chinsky's blood file.

commit 1311cf030098156e02cd8e70bddfef83328ad853
Merge: 1888a4d 7d95a38
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 19:13:30 2013 -0800

    Merge pull request #4117 from comma/bloodydoodle

    Adds ability to write on floors and walls with blood.

commit 1888a4d9567a3b76100c473af97d058647c4209b
Merge: d166d3c ab727ae
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 19:13:21 2013 -0800

    Merge pull request #4116 from comma/showoff

    Adds Show item verb

commit d9a0f496c0337866fc5df610cf89968d63535c56
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 10:35:45 2013 +1030

    Removed debug strings/values.

commit 5b6ec6cd1219ff37d2dc8165de2ce2fb0f40784e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 10:29:42 2013 +1030

    Added arbitrarily coloured blood decals.

commit 8b6da7ec62fca0c80be227fb9d1419178d9e682c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 10:03:59 2013 +1030

    Added mask icons for arbitrary blood splatters.

commit 6b2bfbc38d88a2886ec42d8479f3c9422d837438
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 03:21:46 2013 +1030

    Species-based blood colour support code.

commit 660231f5035a402d0cff3801f57ea49535c12cde
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:57:11 2013 +1030

    Updated .dme for new files.

commit 00a1462ad57457790224e5748c341ceb580c7f9f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:56:55 2013 +1030

    Updated turf procs for new blood system.

commit 3a0448c2e4abee19c1ac0ce10ee6b3ebc8ebca08
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:56:30 2013 +1030

    Added num2dir() proc required by /vg/ blood setup.

commit 8b0f778a83b8e8c4fce0d2b815c238b015503ab9
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:56:06 2013 +1030

    Mass updates to paths for blood decals.

commit dcbf1fff89a7e35108cbfb6ec919f3077d585e14
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:52:33 2013 +1030

    Updated map paths for oil decals.

commit 87c9fc5b7bc7700cdd528aa5a63455ae02f2720b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:47:21 2013 +1030

    Masks for new blood system.

commit 80dc4f352f80858d6277ce2d44e935889447e8a0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:47:07 2013 +1030

    Added blood colour var for /vg/ blood system.

commit 2e0ff4cd87931d39835bc7e1a597917147fbd67f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 26 01:46:39 2013 +1030

    Converting existing objects over to /vg/station blood setup.

commit d166d3c992a79dacaa9ad4d946000ca999c7e8ec
Merge: 61e2a1c 7dfbcda
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 25 03:49:58 2013 -0800

    Merge pull request #4100 from Zuhayr/dev

    DNA2 EPISODE 2: Revenge of the Bugs

commit 7dfbcdae68042c7d2a84d3e1543c0ce06185b46c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 22:14:31 2013 +1030

    Switched some if(mutation) to if(sdisability)

commit 61e2a1c9b84485fee7ac564cf553ac492dfefdc4
Merge: 2777761 e164c7b
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 03:40:24 2013 -0800

    Merge pull request #4097 from Ccomp5950/nanoUI_pda

    NANOUI PDA

commit 2777761cef8910cedd38ac3c0c5f94736abe751e
Merge: 0ff0004 4c4ee3e
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 25 03:39:50 2013 -0800

    Merge pull request #4093 from comma/guestpass

    Guestpass

commit 9202fda78a6b140d72854b2d8841423b4cb20b2f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 25 12:53:49 2013 +0400

    Fixes #4028
    Makes invisimin make mob transparent instead of icon changes.

commit 43acfd6c76c6730e1ba5557bbc455451eed8abed
Author: fauxki <alcoholfox@gmail.com>
Date:   Wed Dec 25 00:36:49 2013 -0800

    - Replaces windows on pods and shuttles with the corrent window.
    - Put in some potted plants, because they look nice.
    - Reworked the engineering dorm a little.

commit ab727aef11511b828295548c2ae032e2cc93a4df
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 25 02:44:42 2013 +0400

    Added link to examine shown item.
    Removed grab handler because it's an abstract item.

commit 7d95a385f2f77a3baa93b302f85c3001086eb560
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 25 01:59:35 2013 +0400

    No messages from beyond the grave pls.

commit ac1c24f35c34b007019eafbe4c9e7bc4a978a181
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Dec 24 13:44:18 2013 +0400

    Adds ability to write on floors and walls with blood.
    Codersprites for now.

commit ddcc5386eb7c004a77fb57e8b049661282233cd3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Dec 24 09:49:23 2013 +0400

    Adds verb similar to ID showing capability for quick showing item in active hand.

commit 0ff0004250968c929131c92ed00e3340d5fc29df
Merge: 782acc9 28340d0
Author: Mloc <colmohici@gmail.com>
Date:   Mon Dec 23 15:36:02 2013 -0800

    Merge pull request #4112 from fauxki/dev

    Sprite Bug Fixes

commit 782acc97cf7a0f4cde6070d6693c077596052431
Merge: bca1aa5 cb3e39c
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Mon Dec 23 15:25:17 2013 -0800

    Merge pull request #4103 from LightningIron/dev

    Removed R&D lockboxes.

commit 28340d01ab3fa9a22507d6bfa7fbcf345cc60723
Author: fauxki <alcoholfox@gmail.com>
Date:   Mon Dec 23 14:53:46 2013 -0800

    #4108 - mispelling was preventing it from showing up.

commit c8b939dfb7f614705aec43177ca3594c9fdf17f7
Author: fauxki <alcoholfox@gmail.com>
Date:   Mon Dec 23 14:52:35 2013 -0800

    #4106 - There was no sprite for purple paint.

commit bca1aa5bd44e0eb0026253b8f34fbc86e5d7a1d3
Merge: cd9c933 a6aa087
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Dec 23 04:39:46 2013 -0800

    Merge pull request #4096 from fauxki/dev

    RD Closet Changes

commit e164c7bfc635ad0f1c07cf37c595fe421d7d79de
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Mon Dec 23 03:21:12 2013 -0600

    PDA-NanoUI

    Fix for the template, and the missing </span> on the manifest.

commit 72727e58d59a0d965a09406e035880ed533da49f
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Dec 23 11:18:00 2013 +1030

    Forgot a tilde.

commit 28df8b73b23606e4ab3c8a37d4394b62f5ce617a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Dec 23 11:15:29 2013 +1030

    Added deactivate() for midget power.

commit cc1c1e29736b38929cf89ebd340ba47ff032de97
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Dec 23 10:36:36 2013 +1030

    Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff.

commit cb3e39c4760dff18976d495ffbc81fb483f9560f
Author: LightningIron <LightningIron@github.fake>
Date:   Sun Dec 22 13:29:28 2013 -0600

    Removed R&D lockboxes.

commit 4c4ee3eae5cc62538a1a1b238bcea1979c2fe069
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 22 23:14:23 2013 +0400

    Counting on machine controller to set uid was foolish of me.

commit 94e94dfa5d01336c532230324730d6708edcb082
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 22 23:08:09 2013 +0400

    Adds gun cabinets - special snowflake secure closets.
    Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.

commit ff52920faba3e5c76657c01d6384a8606acf6fc8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Mon Dec 23 00:06:56 2013 +1030

    DNA2 fixes cherrypicked from N3X15.

commit cd9c933111643eb70b7448daec1f4045de894abe
Merge: 197d499 582bebc
Author: Mloc <colmohici@gmail.com>
Date:   Sun Dec 22 05:32:07 2013 -0800

    Merge pull request #4088 from comma/signs

    Adds signs pointing where department is.

commit 197d4993cf23cb64e73e8fddbb76b8881f829a9d
Merge: 7f5dd90 65fa11d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 22 05:28:35 2013 -0800

    Merge pull request #4087 from comma/nostalgy

    Revisiting my first commits.

commit befb6234176eab81d4748423f513f5cef18530bc
Merge: ec79219 7f5dd90
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Dec 22 07:01:15 2013 -0600

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

commit 7f5dd90e9cdf100fa60c1bf71c071c4f12d723da
Merge: 0aeeff0 d783fd5
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 22 04:54:45 2013 -0800

    Merge pull request #4099 from Zuhayr/dev

    Dev

commit d783fd5043cc8dd8734bac95098fca1f45f069cf
Merge: 1450c96 0aeeff0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sun Dec 22 23:23:25 2013 +1030

    Manual binary merge of head icons.

commit ec7921909faf9e3e6c41260c6be3eb663348225b
Author: Ccomp5950 <Ccomp5950@gmail.com>
Date:   Sun Dec 22 06:18:39 2013 -0600

    NANOUI PDA
    Creates NanoUI for the PDA and Syndicate Uplink.

    New features:
    	Crew manifest now sorted with department heads at the top.
    	Can select individual conversations and delete individual conversations among PDA's
    	Powernet Monitor much more simple now and easier to read.
    	Janitorial supplies locator now includes Janicart.
    	Items will actually refresh if you click "Refresh"

    Some other changes:
    	Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
    	With the conversation change I had to change how tnote (the variable that holds PDA messages works.
    		Setup the message server to use the new methods.
    	Removed procs that will no longer be used (UI generation procs from old UI methods)
    	Commented everything the best I can.
    	Created HORRIBLE, TERRIBLE lists.  But it's pretty much required because that's how nanoUI rolls.
    	Created a variable on the uplink called NanoUI items, this list is created upon creation of the
    		uplink.

    	I included the functionality for Mimes and Clowns for our downstream servers that have those.

commit a6aa087e00bb366918d8d908c1a90a22fe748aef
Author: fauxki <alcoholfox@gmail.com>
Date:   Sun Dec 22 04:17:46 2013 -0800

    Places RD Alt uniform, RD dress, and leather shoes in RD closet.

commit a2f6d7919a45c84ddd68613e2051efa16ce2478a
Author: fauxki <alcoholfox@gmail.com>
Date:   Sun Dec 22 04:16:56 2013 -0800

    Removes RD dress from here, it's to be moved as a subsection of the RD unifrom.

commit 08758cfd6a55e8b097f41980094c15ab016fd546
Author: fauxki <alcoholfox@gmail.com>
Date:   Sun Dec 22 04:16:24 2013 -0800

    Adds in new alt RD uniform, as well as moves the RD Dress from the dress section to a subsection of RD uniform.

commit a973bf2a320b7c52dcc7fa1d9b1bb51080f2a36d
Author: fauxki <alcoholfox@gmail.com>
Date:   Sun Dec 22 04:15:17 2013 -0800

    Adds in alt RD uniform into DMIs.

commit b7a11781e14f4f17251bc5f294c5272ee3841bf1
Author: fauxki <alcoholfox@gmail.com>
Date:   Sun Dec 22 04:14:35 2013 -0800

    Fixes missing pixel from leather shoes.

commit 0aeeff0dd4d46b1865df4958cf4a61379419218e
Merge: 3604986 cf6d919
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 22 00:56:51 2013 -0800

    Merge pull request #4084 from RavingManiac/dev

    Changes to the CentCom medbay and arrivals area. Cryogenic system added.

commit cf6d9190f35a0bbf05a5bd89100d891ee1d1764a
Merge: 7293290 3604986
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Dec 22 13:42:02 2013 +0800

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

commit 68b51d31884387ea9d1247c085d95176bd28a055
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Dec 22 07:53:17 2013 +0400

    Guest pass does not require to be processed anymore.
    Also agent IDs cannot copy access off them now (I think it would make them too powerful)

commit 3604986affde8ce2b67929321d3471dc397247e3
Merge: f56019c 5550c98
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Dec 21 19:45:38 2013 -0800

    Merge pull request #4081 from fauxki/dev

    Gentleman's Outfit for wizard.

commit f56019c953e9d0282ccd7cc029257c3e9a155b66
Merge: bb60213 95ac40a
Author: Mloc <colmohici@gmail.com>
Date:   Sat Dec 21 07:20:16 2013 -0800

    Merge pull request #4082 from Ravensdale/ib_fix

    IB nerf

commit 72932905e5bbf8c46b1bfda29106176196b7733e
Author: RavingManiac <heisen51@gmail.com>
Date:   Sat Dec 21 16:11:32 2013 +0800

    Changes to the CentCom medbay and arrivals area. Cryogenic system added.

commit 95ac40a04aac4acc6b4eaf2e8e03ea0ea68d133c
Author: Ravensdale <Tri@rdinn.com>
Date:   Fri Dec 20 17:01:51 2013 -0800

    Re-balancing for IB, bleed rate is back to usual settings, minor nerf for
    appendicitis initial bleed rate, harder to get IB.

commit 5550c986152bf6e4b1b3df8358171ea0e830cf7a
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 16:59:56 2013 -0800

    Puts the Gentlemanly Wizard outfit in the wizard wardrobe.

commit ad41957f9dac1c2cd82a2e44b769f32a978b2683
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 16:59:24 2013 -0800

    Puts in a gray flatcap for the wizard.
    Adds in a fancy long jacket for him too.

commit 7c695eb9baed10140ad57e4f3cc83cd4c83a823b
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 16:58:34 2013 -0800

    Adds in the gentleman's suit for the gentlemanly wizard.

commit 4c4aa90b7c826f9fc47d83ad2269543d6c160ecc
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 16:56:46 2013 -0800

    Adds the walking cane as a useable wizard's staff.

commit 13fa1709b36aaaee72bf452715d4f5b5c30b3ca0
Author: Ravensdale <Tri@rdinn.com>
Date:   Fri Dec 20 14:03:24 2013 -0800

    IB nerf: Makes it harder to get IB, makes the initial bleed less.

commit bb602139b03fd4e04618762540ac0c86fc06f2f2
Merge: 1ae17bb 247cae4
Author: Zuhayr <AGMogett@gmail.com>
Date:   Fri Dec 20 10:35:57 2013 -0800

    Merge pull request #4074 from fauxki/dev

    Centcom Update + Minor Updates

commit 247cae41a105e87b769f71a94b22ac13295df885
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 01:29:13 2013 -0800

    Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it.

commit 05f012b486719d14e4ea1a812121d0c13f1799fb
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 01:28:47 2013 -0800

    Added in the Longer Hair that was removed in the TG merge under the new name of Flaired hair because to many hairstyles start with long.

commit 92fbda49986400f805dbd8b1d4ef1578cf790391
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 01:27:49 2013 -0800

    Swim shoes weren't showing up because I screwed up DMI names.

commit 6784e8e66874d165e7eef13f86bc20dd66863c57
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 01:27:11 2013 -0800

    The dress is white, not orange.

commit 10ad3edcdec84c88a8f52084ed8f3fde25ca3ff2
Author: fauxki <alcoholfox@gmail.com>
Date:   Fri Dec 20 00:23:07 2013 -0800

    - removes plasma windows from rnd
    - removes additional airlock shutters from windows i missed.

commit 1ae17bb724c60ec6e8ee5d713d331d8424e4ac10
Merge: 19d33bc b0b0388
Author: Asanadas <asanadas@hotmail.com>
Date:   Thu Dec 19 18:17:44 2013 -0800

    Merge pull request #4073 from Zuhayr/borertweaks

    Borer tweaks/additions. Borers for the Borer God.

commit c28aa5c7f23107049711e405ebe44278584b35ee
Author: Rob Nelson <nexis@7chan.org>
Date:   Thu Dec 19 08:15:42 2013 -0800

    DNA2 EPISODE 2: Revenge of the Bugs

    Made after DNA2 hit /vg/'s main server after no one tested anything.

    * Gene activation/deactivation made modular, refactors domutcheck.
    * Standardized genetics disks and injectors a bit in response to buffer corruption issues. (Untested)
    * Lots of major bug fixes.
    * Skin tones fixed.

    Still needs further testing. All I did was mess around with monkeys.

commit dbcb4e368d7d2b39e7a6ef76fa0dc0ff51f118cc
Author: fauxki <alcoholfox@gmail.com>
Date:   Wed Dec 18 18:08:44 2013 -0800

    Updates Centcom level of map. Adds in a medbay, security holding area, and updates the bar and escape shuttle. Wizarding den was also edited to look more fancy. Details and images here: http://baystation12.net/forums/viewtopic.php?f=20&t=9361&p=192264#p192264

commit b0b038873faa7bf927147d004e681df95cc803f0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 19 11:00:21 2013 +1030

    Medical HUDs will now only show brainworms if the worm is controlling the host.

commit 44ef03e43964ec6c745ad3ab167afb4b945a4ae8
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 19 10:38:21 2013 +1030

    Prevents borers from getting through head coverage.

commit 11f8a5835f3949de61c6cd742ab97528186dbb5d
Merge: f936dbd 7c3c2d2
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 19 00:01:12 2013 +1030

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

commit f936dbda319130ffb447bffce52d0cd3e668a47a
Author: Zuhayr <AGMogett@gmail.com>
Date:   Thu Dec 19 00:00:28 2013 +1030

    Possible fix for borers teleporting through windows.

commit 19d33bc2ee948d3bf6403e6cd98c45b922c23f10
Merge: ab27e9c 4e4ee34
Author: Mloc <colmohici@gmail.com>
Date:   Wed Dec 18 05:26:41 2013 -0800

    Merge pull request #4065 from SkyMarshal/patch-4

    Ghosts can see PDA messages.

commit 582bebc0d1451b3ea2e3910c28c2e58642b56372
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 18 12:34:53 2013 +0400

    Adds signs pointing where department is.
    Change dir var to change direction of arrow.

commit 65fa11d49688b083c47f0c49cf35248390543806
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 18 12:02:20 2013 +0400

    Revisiting my first commits.
    Updated ashtray to actually accept cig butts and crush lit cigs properly.
    Applied random transform to cig butts, and made fingerprints from original cig carry over.

commit 5754ba204f26693d9192f414d1c84f9741b64e13
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Dec 18 11:09:12 2013 +0400

    Adds guest passes.
    They act like IDs, but have limited duration (up to 30 minutes). When time is up, all access is erased from them.
    Adds guest pass terminal, which issues these.
    Anyone can issue them, but only to areas their ID has access to.
    All issued passes are logged in terminals.

commit 59f35ade32f5a56d6f351490009e160fad2edb0d
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 15:05:32 2013 +1030

    Added borer checks to handheld and advanced scanners.

commit cc2dc32f1b01a5bc3aa0373b759c5a28821e4058
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 14:53:56 2013 +1030

    Added short-range paralysis proc for unhosted borers.

commit 501f94d39946bc881e74d30dc0797632798344aa
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 14:38:00 2013 +1030

    Added sugar docility to borers.

commit 58ec6756df4bd35101f5bbf78e5c107699c40f28
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 14:25:38 2013 +1030

    Added cortical borer spawn event and admin verbs.

commit d21b26658a663f8a16c16e8a8d78568dc03d3d90
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 14:10:43 2013 +1030

    Added ghost eavesdropping for borertalk.

commit c5849aaa96656c614eada14e435d32ba4d988207
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 14:03:04 2013 +1030

    Added cortical borers to the various HUDs.

commit 4e4ee34ec82d77de4bc41d1dce9c5606ed3d6416
Author: SkyMarshal <joehe.inemeyer@gmail.com>
Date:   Tue Dec 17 20:24:00 2013 -0700

    Herp derp

commit 65eb6354c5d308e81ceb018f8854d407bc6e8879
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 13:50:58 2013 +1030

    Various tweaks to cortical borers taken from the /tg/ discussion on the potential port.

commit 822b5729624d8ee2d032c775d89b6592cb0c3c5c
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 13:50:11 2013 +1030

    Plopped the borer out of the skull when the brain is removed.

commit 9fe07feb95d19467378aa4154444797e872c56c0
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 13:49:35 2013 +1030

    Prevented staff of change from working on infested mobs.

commit f8ebd9d5de50d6352be46bb0c30a22ef175038f7
Author: Zuhayr <AGMogett@gmail.com>
Date:   Wed Dec 18 13:49:10 2013 +1030

    Added checks for borers to various key-swapping powers to prevent weirdness.

commit e03f475b18ebf7ff3c1b63830b53ab10b5dc53c0
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon Dec 16 20:48:00 2013 -0700

    Ghosts can see PDA messages.

commit 2c6afaa4c03ba1ab9c668546be48fd54d93982dc
Merge: 8813123 434283d
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Nov 29 17:02:57 2013 -0800

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

commit 8813123997497d74352338075116b615dcb1e37c
Author: DJSnapshot <trevornaze@gmail.com>
Date:   Fri Nov 29 17:02:23 2013 -0800

    added config flags for objectives being enabled or disabled.
    added antag options menu.
    added ability to choose where a syndicate uplink is installed.
Catching up Master.