Merge pull request #2885 from Ravensdale/master

Cyborg sprites
Merge pull request #2890 from VitrescentTortoise/bleeding-edge-freeze

Fixed forcewalls spell and xenoarchaeology picksets, also gave nuke team magboots.
Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click).
Fix for crew monitoring consoles turning spriteless when destroyed.
Merge pull request #2894 from MagmaRam/master

Minor sprite fixes
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Merge pull request #2895 from Erthilo/bleeding-edge-freeze

Bringing Bleeding edge freeze up to date with master
Squashed commit of the following:

commit 722cf3d3f8751e677a68ee0cc59f36d5f0e293eb
Merge: 40e63cb c788e9d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 28 23:58:37 2013 -0700

    Merge pull request #2894 from MagmaRam/master

    Minor sprite fixes

commit c788e9d323645499581177f4b6a459034d6d892a
Author: MagmaRam <drpepper42yes@gmail.com>
Date:   Wed May 29 13:42:03 2013 +0700

    Fix for crew monitoring consoles turning spriteless when destroyed.

commit e4c913fad9c74767bb352f5edc11fbbc43426f2a
Author: MagmaRam <drpepper42yes@gmail.com>
Date:   Wed May 29 13:34:54 2013 +0700

    Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click).

commit 40e63cbe32c6e652e73dcf4cd7bbe82c99e302fb
Merge: 1f039e9 62e43f2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 28 22:17:13 2013 -0700

    Merge pull request #2885 from Ravensdale/master

    Cyborg sprites

commit 1f039e96bbda48e651a7ae5f4a8af4adc80b5d01
Merge: b80ae68 01ef589
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 28 22:16:50 2013 -0700

    Merge pull request #2888 from Erthilo/master

    Fixes everyone being able to understand everyone else.

commit 01ef589293a736b49dafe34891b253899dd22a7d
Author: Erthilo <erthilo+git@gmail.com>
Date:   Tue May 28 23:53:49 2013 +0100

    Fixes everyone being able to understand everyone else.

commit 62e43f2abf5c906f10e8abf045e4c6ca089b2d50
Author: Ravensdale <Tri@rdinn.com>
Date:   Tue May 28 12:07:22 2013 -0700

    re-adding an accidentally deleted line

commit b80ae68cc576f04dfe1994ff4bebdbc80efbb70b
Merge: d2179f4 a9d4d86
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Tue May 28 11:49:25 2013 -0700

    Merge pull request #2883 from CIB/master

    Re-buff even timer

commit b42aa26c1a4658910bfb344cd31f036ed9771a00
Author: Ravensdale <Tri@rdinn.com>
Date:   Tue May 28 11:13:33 2013 -0700

    Gives more sprites for cyborgs to use.

commit a9d4d86ed92184e26a55b409cec2c5bb78d9c651
Author: cib <cib123@googlemail.com>
Date:   Tue May 28 20:03:26 2013 +0200

    Event balance fixes.

    - Engineering events now less likely
    - Radiation storm now less likely
    - Halved radiation given by radiation storm.

commit d2179f425286c3219b93103f79889be6582791ef
Merge: faef29f c5dc8eb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 27 12:04:19 2013 -0700

    Merge pull request #2875 from CIB/medical_events

    Fixed issue #2689

commit faef29fe41210a6c73d1c68ec4d207b43b2a6ffb
Merge: b4743be d9a88f2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 27 11:14:40 2013 -0700

    Merge pull request #2873 from fauxki/master

    Map Fix

commit c5dc8ebecf92a955bc8e25bd85692e03677ba74d
Author: cib <cib123@googlemail.com>
Date:   Mon May 27 20:01:37 2013 +0200

    Triped time you have to get into maintenance.

    Also re-added sound at start of event. It doesn't fit, but it's better than nothing. Quit complaining already.

commit d9a88f236a7f4e810f3cab47cdcf041ef2f83c98
Author: fauxtada <alcoholfox@gmail.com>
Date:   Mon May 27 09:58:03 2013 -0700

    Fixes airless tiles under airlocks issue that was messing with zas.

commit 6eee010a34cbeaddfa0f40e42abbaac0b7086c90
Merge: bef1de0 b4743be
Author: fauxtada <alcoholfox@gmail.com>
Date:   Mon May 27 08:43:50 2013 -0700

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

commit b4743bef2624b354e06d3c0565e0d5324c24d1d8
Merge: e760114 cbbe291
Author: Mloc <colmohici@gmail.com>
Date:   Sun May 26 14:56:53 2013 -0700

    Merge pull request #2865 from CIB/medical_events

    Fixed various medical events.

commit cbbe291a5d7a3b8131b6614e32fb580fbd5a059d
Author: cib <cib123@googlemail.com>
Date:   Sun May 26 23:21:08 2013 +0200

    Fixed various medical events.

commit dbe960a57127587ed6a7174f63f618c72ce5f60a
Author: cib <cib123@googlemail.com>
Date:   Sun May 26 22:16:11 2013 +0200

    Buffed event delay a bit again.

commit cab12895110a7def0c7f95e3971ce2124ffcb873
Merge: 9074622 0834944
Author: cib <cib123@googlemail.com>
Date:   Sun May 26 20:43:22 2013 +0200

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

    Conflicts:
    	html/changelog.html

commit e7601146a9642f37e52aef150745dc1c529b2cad
Merge: 0834944 420354d
Author: Mloc <colmohici@gmail.com>
Date:   Sun May 26 11:41:10 2013 -0700

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

    BEF merge

commit 420354d1dc422ea021fee9e11b07d16a4b5572c1
Merge: 81c737c cab1289
Author: Mloc <colmohici@gmail.com>
Date:   Sun May 26 11:40:42 2013 -0700

    Merge pull request #2860 from CIB/master

    Fix to event no-repetition code

commit 81c737c5a482214c71624737781f84bf6bb958a2
Merge: b469245 30a39d5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 26 11:29:39 2013 -0700

    Merge pull request #2863 from meyar/master

    Derp

commit 30a39d580fcb14027e7d78367c9da73be6d8e4f0
Author: meyar <grimreaper219@hotmail.com>
Date:   Sun May 26 14:26:00 2013 -0400

    Forgot about airlock access

commit b46924556bff96e4d543d615447a67c91edb229a
Merge: 796c800 f6f263e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 26 11:21:26 2013 -0700

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

    Wall Recharger Fix - bef

commit 796c800b54b6339d47d070ba1db0c60ed7abc1bd
Merge: 76525a4 61b7aa0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 26 11:14:39 2013 -0700

    Merge pull request #2858 from meyar/master

    Meyars changelog

commit 61b7aa06ae70a45c419c83f061213cb58e58f2c0
Author: meyar <grimreaper219@hotmail.com>
Date:   Sun May 26 12:14:18 2013 -0400

    Remembered to actually add to the changelog

commit 76525a4ccfa483a6107708499c0f8cae1eeaee3e
Merge: 7971342 827e85c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 16:03:24 2013 -0700

    Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze

    Changeling husk names now 'Unknown'

commit 827e85c4c345b98dc177f62ec2bd9ef278397237
Author: VitrescentTortoise <max.blackllama@gmail.com>
Date:   Sat May 25 16:00:22 2013 -0700

    Properly sets husks' names to unknown

commit 9074622eb96e4985b3180fa4b2d50d3fcb892322
Author: cib <cib123@googlemail.com>
Date:   Sun May 26 00:23:31 2013 +0200

    Adjusted event chance modifier based on last event.

    Had the wrong numbers, basically every event would happen only once.

commit a764c226f897a16454b540a8ea20df668199a9d3
Author: cib <cib123@googlemail.com>
Date:   Sun May 26 00:12:59 2013 +0200

    Implemented a system to avoid the same event happening too often.

    Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.

commit 7971342d3f9ba5882c7999aadb3def9553904fd9
Merge: cc020eb a764c22
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 15:11:56 2013 -0700

    Merge pull request #2854 from CIB/master

    Implemented a system to avoid the same event happening too often.

commit 08349440302b38680349bc73059a05d653dd5cae
Merge: d8ed2d2 e2ea94d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 14:45:37 2013 -0700

    Merge pull request #2853 from Erthilo/master

    Mutant Races, UI Genetics fixes

commit cc020ebeba2b78672c0238850e8fe04e994f8e37
Merge: 858d98e afb49c0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 14:21:47 2013 -0700

    Merge pull request #2851 from VitrescentTortoise/bleeding-edge-freeze

    Fixed lemonjuice showing up as ..what?

commit c451287aa8b91b817024eb3367896f6c8dda44c8
Author: VitrescentTortoise <max.blackllama@gmail.com>
Date:   Sat May 25 14:17:16 2013 -0700

    The name of changeling husks is now unknown

commit e2ea94d59c9ddcc06aa52d3bf51384a26e0a27da
Merge: 77c5123 d8ed2d2
Author: Erthilo <erthilo+git@gmail.com>
Date:   Sat May 25 22:16:29 2013 +0100

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

commit 77c51235afab040f4ec9372ed7297fd260381ff5
Author: Erthilo <erthilo+git@gmail.com>
Date:   Sat May 25 22:15:42 2013 +0100

    Changelog updated and archived.

commit 0e3bf2f371aa678d3e0de5998edae39aced7ab48
Author: Erthilo <erthilo+git@gmail.com>
Date:   Sat May 25 22:10:14 2013 +0100

    Fixes UI being reset randomly on irradiating in Genetic Scanners.

commit 4028172c9854afffcdf8c9465d964d42e717fc58
Author: Erthilo <erthilo+git@gmail.com>
Date:   Sat May 25 22:09:41 2013 +0100

    Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word.

commit c2b84e0985ae8139d4f567839beb06d5616cf051
Author: Erthilo <erthilo+git@gmail.com>
Date:   Sat May 25 22:08:57 2013 +0100

    Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned.

commit afb49c05d95a2082a1c60a48184f3909bcce46be
Author: VitrescentTortoise <max.blackllama@gmail.com>
Date:   Sat May 25 12:52:56 2013 -0700

    Fixed lemonjuice showing up as ..what?

commit f6f263ebcdc217af5697ded277c6626b367de4ec
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sat May 25 09:32:25 2013 -0700

    Wall Recharger Fix
    - Oopsie. Sprites should work now when recharger is charging.

commit d8ed2d2b29a181f7f4cc71591ef6bfdafebbc2a1
Merge: 4f293e5 e197799
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Sat May 25 06:12:16 2013 -0700

    Merge pull request #2850 from comma/master

    Couple of fixes

commit e197799c4690218e9766c1f100c9af2cd9fbfdd7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 13:34:24 2013 +0400

    Fixes #2830
    Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.

commit b78cb81a3850ace0bfb422bdcf6dd62366f2590c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 25 13:18:12 2013 +0400

    Fixes #2849
    Applied Walter0o's fix to job controller changing whole job's access when single ID was modified.

commit 858d98eb7c91f6039608e71754780e14d78bb18f
Merge: 5eb23b9 1486e4b
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Fri May 24 14:30:36 2013 -0700

    Merge pull request #2816 from comma/HTML

    HTML in papers

commit 5eb23b9ceef406768f9f5c54b21b8d23731ee072
Merge: 0a15485 e0f4b0d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 24 14:28:30 2013 -0700

    Merge pull request #2848 from Asanadas/bleeding-edge-freeze

    Bugfix: Prevents airlock_controller.dm and similar from being destroyed ...

commit e0f4b0d1ed8d12c1c8e896e86eec589e4cb30906
Author: Asanadas <asanadas@hotmail.com>
Date:   Fri May 24 14:55:28 2013 -0400

    Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches.

commit 0a15485377bba204513c3a256a94f66d63d56505
Merge: f9a81bc 1ac5ac6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 24 05:07:06 2013 -0700

    Merge pull request #2847 from meyar/master

    Git hates me

commit 1ac5ac6ec54d2da4ee81234a308c7a0a604b9c63
Merge: 3e6261e f9a81bc
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri May 24 07:55:24 2013 -0400

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

commit f9a81bc57c03629e1ecdde2f3e3c3775f45ec403
Merge: 33f8309 cb5b83f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 24 04:54:32 2013 -0700

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

    BEF - Wall Charger / Map Changes

commit 3e6261ea0465e91d80777c46bd443c9536718fb9
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri May 24 07:38:00 2013 -0400

    Once more with feeling

commit 1d5d7cb90192a1f6e263f2d950eb334fdd82c5ad
Merge: fe077a1 33f8309
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri May 24 06:52:03 2013 -0400

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

commit fe077a1f08670a03c4fda868f2330f7a9632ad39
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri May 24 06:08:34 2013 -0400

    Fixes the nuke shuttle (Again. Goddamnit)
    Fixes the Bar sign (Request by apple master)
    Fixes the research hazard doors having blind spots.

commit c1e701f32b2aa7161c399c1e307db276abe768ff
Merge: f09803c 1da1592
Author: meyar <grimreaper219@hotmail.com>
Date:   Fri May 24 05:23:36 2013 -0400

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

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit cb5b83fadbfe287acedb2d85dca73292febdcdb3
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 23 17:46:31 2013 -0700

    Wall Charger Addition / Map Edits
    - Puts in wall recharger sprite. For all your wall recharging needs.
    - Reverts changes someone did moving my wall temp placement wall rechargers..
    - Fixes airlocks over doors issue in sec.
    - Also removed the access medical from the medical area of security. It's just a quick area to treat cuts and bruises, and shouldn't have items that treat more then that.
    - Fixed some more weirdly placed rechargers around the station.
    - Replaced the TG Maltese Falcon sign with the BS12 one.
    - Fixed up the floor in the pool area.
    - Added some lights and decorative items to that weird tator / table area south of the security pod. As well as a water tank and fuel tank.

commit bd8a2f7d715e2d24e3a8616b2a657492f0b762c2
Merge: cbaeb8a 33f8309
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 23 16:21:28 2013 -0700

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

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit 33f8309c5b66d94ae1efed2034d938d1f0516375
Merge: 62e5253 e9fc666
Author: Asanadas <asanadas@hotmail.com>
Date:   Thu May 23 15:13:19 2013 -0700

    Merge pull request #2844 from CIB/master

    Removing hijack means less bloodshed, plus we already admin change it whenever it pops up.

commit e9fc666cdba9b82f94a9d22f515e805ae749a0be
Author: cib <cib123@googlemail.com>
Date:   Fri May 24 00:12:29 2013 +0200

    Removed hijack from wizard.

commit 0bfb43b8641e0769a889826135a340bef1070a08
Author: cib <cib123@googlemail.com>
Date:   Fri May 24 00:09:47 2013 +0200

    Removed hijack objective. AGAIN.

commit 62e525329b564328381993ba54b4214e20c80d8c
Merge: 3c12277 89aa936
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 13:48:33 2013 -0700

    Merge pull request #2842 from CIB/master

    Rev fixes

commit 4f293e500028fec56be507e8dc06b572e76fec86
Merge: 5c26b1e ef2c7af
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 13:46:47 2013 -0700

    Merge pull request #2843 from Kilakk/master

    Telescopic baton extend/collapse message fix

commit 89aa936147f683d23a179d0c294aa148daff7b49
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 22:46:27 2013 +0200

    Fix to organ_failure event.

commit ef2c7af6a036ddc828da66a74428999028f3026c
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Thu May 23 16:24:53 2013 -0400

    Telescopic baton message fix.

    Fixed first- and third- person extend/collapse messages for the
    telescopic baton, woo

commit b5217d862a90267f51b498bf13544238dd31edcf
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 22:12:20 2013 +0200

    A few fixes to rp-rev

    - Name was empty, hopefully using real_name fixes that
    - Announcements coming too quickly
    - Fixed icon path issue

commit c4b8ef6e59e657fa8990e77876da5f804f147b23
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 20:27:13 2013 +0200

    You can't close emagged doors anymore, but you can still remove circuitry.

commit 3c1227741db38ff829375c2a8326264e26a6877c
Merge: b0654c1 c4b8ef6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 11:24:09 2013 -0700

    Merge pull request #2839 from CIB/master

    Fixes to airlock fixing stuff

commit b1b448e0eea1f2fd9c4477aae87f70d0b15a9a1e
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 20:15:45 2013 +0200

    Adjusted event announcement delays.

    Also improved some radiation belt announcements.

commit ce19719700d6df9aacdfc0efa99e94233b294eab
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 19:47:33 2013 +0200

    Fixed two problem with airlock/APC commit:

    - Debugger now sends messages to user instead of usr(whoops)
    - Can now close emagged door with crowbar so you can take out circuit
    - Couldn't weld emagged doors
    - Replacing the circuitry should now be sufficient to fix an emagged door.

commit 5c26b1ea79fdeefc15de4d9ee996544868640221
Merge: 91bea95 629022f
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 23 09:11:05 2013 -0700

    Merge pull request #2837 from comma/master

    Fix for LSD zombies.

commit 2bfc48e0972813d41c01a0af77fa28d11329e399
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 17:06:11 2013 +0200

    Fixed .dme

    Seriously..

commit b0654c1d554503426c2362aa798518117899cf54
Merge: 8b60bab 2bfc48e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 08:04:34 2013 -0700

    Merge pull request #2838 from CIB/master

    APC and airlock stuff

commit aa6bfc33c743c2bc1cc1faa2a7bfc75d427aa644
Author: cib <cib123@googlemail.com>
Date:   Thu May 23 16:43:29 2013 +0200

    Airlock and APC changes.

    - Added a debugger device that can figure out when an object has been hacked/emagged
    - Hacked APCs no longer display blue screen
    - You can now disassemble emagged airlocks, they will yield a fried airlock electronic.

commit 629022f7b0c6a3e2bfa34f9b7f05fcd6f9edb763
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 15:06:37 2013 +0400

    Fixes #2836
    Winners do not use space drugs.
    Fixes LSD giving you an ability to escape death once.
    Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
    My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.

commit 8b60bab4a7031e36abf7550b769a2ffd83d4ee83
Merge: 996c967 cb59473
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 23 01:55:45 2013 -0700

    Merge pull request #2835 from Roaper/master

    No tears, only dreams

commit bef1de05cb2685c9d55c9ccf1ffdc236511b872e
Merge: 91bea95 996c967
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed May 22 14:14:11 2013 -0700

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

commit cb59473d02de8a286f378825a65798b5a949dca7
Author: Roaper <roaperable@gmail.com>
Date:   Wed May 22 13:36:27 2013 -0700

    Added more dreams to Dreaming.dm

    Signed-off-by: Roaper <roaperable@gmail.com>

commit 91bea952bb8a3d0df7dce6c34693d571b788ed32
Merge: 93352ae b22d43d
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 11:30:03 2013 -0700

    Merge pull request #2831 from comma/master

    I did something.

commit 996c967429200d8b0a1708af709b8adfa3dd551d
Merge: 80b8a5e 6ef40ee
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 11:29:43 2013 -0700

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

    Bleeding edge freeze

commit 6ef40ee7a7bf1dd268072119d2852739d313b2fe
Merge: 495fd94 80b8a5e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 21:35:50 2013 +0400

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

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit 495fd944ffbb55df0db83bd184a22c7d2d404b0e
Merge: 317cbd8 b22d43d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 18:34:08 2013 +0400

    Merge branch 'master' into bleeding-edge-freeze

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit b22d43dfa1164f22a6c2c56d960c769f80b0cac0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 17:27:54 2013 +0400

    Reapplies reverted changes.
    Which are:
    fixed psych pipes linking distro,
    fixed pipes and wires and disposals in sec,
    added missing cameras to sec/research dock,
    fixed the bridge charger,
    moved the ugly wallchargers in sec,
    added a valve for the permabrig nitrus

commit 317cbd84384c72d2539b1e19f6db16a21cbc2e58
Merge: bdb16b1 da99e06
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 16:51:41 2013 +0400

    Merge branch 'master' into bleeding-edge-freeze

    Conflicts:
    	baystation12.dme

commit da99e06c8ede51f4e198e61df1545b232f1f9bf6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 16:49:25 2013 +0400

    Untracked accidentally committed file.
    what the hell is this file doing in repo...

commit 548f6760cf3d699ee89865c7c92f4e80ef59e2ba
Merge: 1ca42d0 93352ae
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 16:37:40 2013 +0400

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

commit bdb16b1f994fa30f65adbec296449d4bb82c2027
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 14:05:53 2013 +0400

    Renamed bruise pack back to gauze.
    STAY LIKE THAT.

commit 80b8a5e70f532738387ca829b913b8732ccce64a
Merge: 17e31e8 93352ae
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 10:53:29 2013 +0100

    Merge master.

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

commit 93352aee2c05164cf8f7b2ff816e5a750408f491
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 10:51:40 2013 +0100

    the fuck did I do there.  should be fixed now.

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

commit bd2d2311f1ef81d90d6aaecebfcbbc7c8db68f1b
Merge: 6635552 33c2b45
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 10:36:05 2013 +0100

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

commit 6635552ff4fc55c4b3019d413f0d18f0eb3ba0e9
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 22 10:34:46 2013 +0100

    Pulls back map changes.  Put those in BEF.

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

commit 1ca42d0c88d2d35ed7034fe59bb29e666d2b7f93
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 22 12:55:15 2013 +0400

    Fixed some sharp stuff not being recognized as such.
    That lead to knives bruising people you stab, for example.

commit 33c2b45818f813522a3a83b7406bb6f54f775b98
Merge: 77e5057 8f28b64
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 21 23:56:14 2013 -0700

    Merge pull request #2828 from Jamini/master

    More mapfixes.

commit 17e31e80a7f0e4eac92df6733ec6c6dab564c37d
Merge: 5ac00ad ac0373b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 21 23:34:28 2013 -0700

    Merge pull request #2829 from SkyMarshal/zas-cleanup

    ZAS Cleanup/Tweaks

commit ac0373b01b9eabcb94609084067abd7f56edc107
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Tue May 21 23:14:43 2013 -0700

    Mapfix.

commit 6c8b0c23dcd9ceb41aa8235e9c1fdcb3c3c669d2
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Tue May 21 22:50:21 2013 -0700

    Small fixes, updated changelog.

commit 39df196edca3c276fc50350fcf775a8313b83af4
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Tue May 21 22:37:50 2013 -0700

    Fixed disposal issue.
    Delayed Jungle setup until after air master initializes
    Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
    Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
    Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
    Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.

commit 46907066ba25398662367cc3c33f1adf10b10cdd
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon May 20 23:54:01 2013 -0700

    Somgfkuf

commit 3420b0a6fea750d1b130bcfef385956cb8b19182
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon May 20 20:30:21 2013 -0700

    Cleanup Debug.dm and Functions.dm

commit 252d10fd67153e14968f789fc2deb30694731f4e
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon May 20 19:58:48 2013 -0700

    Compile fix.

commit 0ede4e13f978f59501405ff48a87ce06069ac0f9
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon May 20 19:52:41 2013 -0700

    Cleaned up and commented Connection.dm

    Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>

commit 8f28b6411978aa2a2dcda358ff88bfe624fc6a8b
Author: Jamini <mobiousjami@gmail.com>
Date:   Tue May 21 22:46:37 2013 -0400

    Mapfixes - Hopefully

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

commit 77e50575340843f39675bc7038a91cb767d25aa0
Merge: 2b39eea 42a9c4d
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Tue May 21 15:15:33 2013 -0700

    Merge pull request #2826 from Jamini/master

    MASTER - Mapfixes.

commit 5ac00adbaeff514446c57226e2f28e493645ff42
Merge: 1b0c6b9 2cb2718
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Tue May 21 15:14:23 2013 -0700

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

    BEF - Mapfixes.

commit 42a9c4d731c9de07f28ccfdb6a0a52e8ed1b0f85
Author: Jamini <mobiousjami@gmail.com>
Date:   Tue May 21 18:03:21 2013 -0400

    Mapfixes.

    Same fixes as on BEF. These are atmos/bugfixes and should be merged.

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

commit 2cb27184fe6c9229717cd6035031cec59011ac86
Author: Jamini <mobiousjami@gmail.com>
Date:   Tue May 21 17:46:31 2013 -0400

    Mapfixes, mostly pipes and wires that were broken in security and medical.

    Fixed an external airlock, added security cameras.

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

commit 4885a08b27458d4bf02014f3fff7cb3ed44b4e4c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 21 19:24:53 2013 +0400

    Added 5 TC uplink to RevHeads.

commit 1b0c6b942a2fea4fdfd5e22212eb2f58111abf86
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 21 18:08:28 2013 +0400

    NOW IT COMPILES.
    Incomplete rename.

commit f09803c74d108eaefd1c80e77a58c9db9a7f08c2
Author: meyar <grimreaper219@hotmail.com>
Date:   Tue May 21 04:30:27 2013 -0400

    Fixes Nuke shuttle airlock

commit 2b39eea44ed0d96ceca90be628a0f9dbc01a1239
Merge: 048c684 c3b9937
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 20 19:58:40 2013 -0700

    Merge pull request #2821 from Kilakk/master

    Security mini map fixes

commit 1da1592ac2f77a338c7c696f50d831de9e6c728d
Merge: 99fcf1b 3b09c8b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 20 16:31:52 2013 -0700

    Merge pull request #2818 from CIB/feature

    Space no longer has a heat_capacity

commit 3b09c8b3a664120c1b3e57769f8266e7ac8ed88f
Author: cib <cib123@googlemail.com>
Date:   Tue May 21 00:46:12 2013 +0200

    Space no longer has a heat_capacity

    I mean, seriously? Magical realm of heat absorption? Screw that, space is now room temperature!

commit c3b9937db489349ac737db63c6f19adc83c796f9
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Mon May 20 18:13:03 2013 -0400

    Security mini map fixes

    - Added a missing power cable in the Security Lobby
    - Added a missing Scrubbers pipe in the Security Lobby
    - Moved the Armory Exterior camera, which was previously floating
    - Moved the Gateway, Bridge, and Head of Personnel rechargers back to
    their rightful place: on a table
    - Rearranged the caution lines for the SMES units
    - Added a camera to the Research Shuttle Hallway

    - Used maptools this time

commit 99fcf1b3beb894f1b5c418755718ab66c858637a
Merge: 71a0ed7 99ff1f7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 20 14:34:15 2013 -0700

    Merge pull request #2819 from Roaper/master

    Readded Pockets in the Responder Jackets

commit 99ff1f7ee06193175479f3ffdea39b58127e1f4f
Author: Roaper <roaperable@gmail.com>
Date:   Mon May 20 13:33:44 2013 -0700

    Added Pockets to First Responder Jacket

    Signed-off-by: Roaper <roaperable@gmail.com>

commit 048c6845e95e00a37cd3e547027a2daa2a2ec685
Merge: e032e31 8b43fec
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 20 12:36:50 2013 -0700

    Merge pull request #2796 from CIB/report_adjustment

    Experimental report balance change

commit 71a0ed7049d5888b495a2ae170ca1d98c388cd33
Merge: ccdec12 1784bcb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 19 04:24:25 2013 -0700

    Merge pull request #2812 from caelaislinn/rust

    RUST updates

commit e032e3101df6f53aee025bb52ca66c5396343b1c
Merge: 639da5b 7067382
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 19 04:24:15 2013 -0700

    Merge pull request #2811 from caelaislinn/xenoarch

    Xenoarch tweaks

commit 1784bcbb046c9f77292cf648418af33eaa62d467
Merge: 454d67d ccdec12
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:41:18 2013 +1000

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

commit 454d67d89967acec1673cf9cf0192bed632251f2
Merge: 887493e 639da5b
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:34:10 2013 +1000

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

commit 887493e1d557ca8bfea4dc241fb5b3dcc06021b2
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:33:12 2013 +1000

    changes to make testing easier: machinery starts welded+bolted, split up the space loop into a bunch of small ones, added a button for the core shutters

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

commit 7067382f52154333ba9c36c39247a63f0c987af5
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:12:42 2013 +1000

    hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt

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

commit 9d17d240638c2d8a665f56eab9babbdc0dfe8994
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:08:57 2013 +1000

    rewrote fusion reactions to use datums instead of a switch statement (with reaction recipes stored in the master controller for debug editing), restructured fusion recipes to be more balanced + gameplay-centric, rewrote fusion reactions to use (mostly) fictional elements, miscellaneous fixes and cleanup

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

commit 751adf718799e7322cecbf26342c0bcc651fe01b
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 19:05:51 2013 +1000

    miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery),

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

commit ccdec1201f0bf5a11bd9f915b5f8cbbdb85d2a7a
Merge: a5a0315 f12a2cb
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 19 02:04:43 2013 -0700

    Merge pull request #2808 from CIB/feature

    Some changes

commit ebe2e26ed3128525dad92b1ce306a7bedda0f647
Author: meyar <grimreaper219@hotmail.com>
Date:   Sun May 19 05:00:06 2013 -0400

    Fixes the Syndicate nuke shuttle airlock (In that it cycles now)
    Re-added external airlock access to the traitor ID card, restoring lost functionality.
    Fixed the ERT radio. It now works.

commit 1d9fe082d71ec990ffc228c3139a8d6af4462522
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun May 19 18:50:15 2013 +1000

    made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k

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

commit f12a2cb3277056cdb3d09c8f81f0f63bdffc10b2
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 07:49:07 2013 +0200

    Added stasis bags to medbay, engineering and security.

commit f5b0b52b6c6f3951104f93a47dc3bdbb615f76d6
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 07:48:43 2013 +0200

    Added stasis bag.

    This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.

commit ac8b64734b532a127626b682d68c15e5f5b0a609
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 07:47:18 2013 +0200

    Fixed a few problems with newscasters.

commit b6231ec33b1c9022f91c1dbbeb01f07f7a4ffe65
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 06:03:39 2013 +0200

    Added more community news.

commit 914a9079f0ff70f1528b85458dfc467a2f5079ec
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 05:56:18 2013 +0200

    Added serithi's soundbits as mode sound announcements.

commit fc20393b60dbfdb740e8b29eda5176951a872052
Merge: 8cfc395 639da5b
Author: cib <cib123@googlemail.com>
Date:   Sun May 19 05:54:14 2013 +0200

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

    Conflicts:
    	baystation12.dme

commit 639da5b25b5f28f5823d972de41a1b1eee4e28ce
Merge: ef6d4c8 1d5dfcb
Author: Asanadas <asanadas@hotmail.com>
Date:   Sat May 18 19:11:43 2013 -0700

    Merge pull request #2792 from comma/master

    Sec Wing fixes

commit 1d5dfcb4dbd621bcbdd1836bea02f8365e69ec0e
Merge: b4ff6d2 ef6d4c8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 19 04:51:36 2013 +0400

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

    Conflicts:
    	baystation12.dme
    	maps/tgstation.2.1.0.0.1.dmm

commit ef6d4c8a03ecad88a142d6920d6950201d537199
Merge: 6c062dc d7876da
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 16:30:47 2013 -0700

    Merge pull request #2797 from MagmaRam/master

    Bugfix: Sprite issues on custom cameras (orange camera and old camera)

commit d7876da147a809faa8bd4875d011cb1c7de569f5
Merge: fbfa125 6c062dc
Author: MagmaRam <drpepper42yes@gmail.com>
Date:   Sun May 19 06:21:32 2013 +0700

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

    Conflicts:
    	icons/obj/custom_items.dmi

commit a5a0315d0f67509822964215c51b99453aefe71a
Merge: 68d7c39 8cfc395
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 16:06:35 2013 -0700

    Merge pull request #2805 from CIB/feature

    Fix for recent commit, plus new stories

commit 8cfc39523210798d8682c65293149754e3a46fd9
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 23:20:20 2013 +0200

    Added community-made newsfeeds.

    Yay!

commit 31cbea43f0c448731ef3c69e349d8dd946d6b5ce
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 23:20:06 2013 +0200

    Forgot wallrot.dmi

commit b4ff6d2a86f9ae6a8c2cd6bb42259295fdec3160
Merge: f5924d6 6c062dc
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 19 00:53:15 2013 +0400

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

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit 68d7c3912ef7212979be1ea9f026fe1742c427a2
Merge: 75376af 670bf5b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 13:20:56 2013 -0700

    Merge pull request #2804 from CIB/feature

    Radiation storms consider maintenance now.

commit 670bf5bb76877c5d108b2fd3da720eb2cce14bd9
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 22:18:37 2013 +0200

    Radiation storms consider maintenance now.

    Also, a fix to spray(whoops!)

commit 75376af315b31f7520ad572096853c3fd50165ed
Merge: 80df80f d7cc42e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 12:55:47 2013 -0700

    Merge pull request #2799 from CIB/feature

    Most mobs can emote now.

commit d7cc42e588a75a3d72570956240e12570ffadb8d
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 21:55:02 2013 +0200

    Added wallrot event.

    Also some updates to changelog.

commit 38cdb4d4f53ce3c512dc8ccf6817d4724e415677
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 18:17:28 2013 +0200

    Most mobs can emote now.

    Also added CSS to say, so that you can tell apart "say" and "me say"

commit fbfa125f4bfdb95481436e592d1051aab2d40271
Author: MagmaRam <drpepper42yes@gmail.com>
Date:   Sat May 18 22:00:15 2013 +0700

    Bugfix: Fixed issues with custom item camera sprites

    icond/obj/custom_items.dmi: renamed off sprite for blue camera

    code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

    /code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites

commit 8b43fec2628e0e9c864526817a3a8b5318703d11
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 15:21:14 2013 +0200

    Balance change to suspect list.

    Antagonists now have a HIGHER chance to be suspected. Simultanously, traitors and other uplink users get another +4 TC and a warning if they are suspected.

commit 6c062dc05c19c9c33c012e4bb8baaa720c9945ac
Merge: dadf37f cd5f088
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 06:11:46 2013 -0700

    Merge pull request #2793 from meyar/master

    Fixin' the traitor ID

commit dadf37faef0009805fb346250f0f712968eea29a
Merge: 229fb46 6e85a3e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 06:07:10 2013 -0700

    Merge pull request #2795 from fauxki/master

    Fixes for Master

commit cd5f0885ff0a12a8f197c1991b524ba7528225c2
Author: meyar <grimreaper219@hotmail.com>
Date:   Sat May 18 09:06:36 2013 -0400

    Adds ERT radio

    Makes the ERT frequency accessable

commit 80df80f42f7b3109342d93d2e1c069db3ff9b10f
Merge: 125991b 22ea35c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 06:05:08 2013 -0700

    Merge pull request #2794 from CIB/feature

    Many things

commit 6e85a3ed42443650eb2bfe97fdf652e548ababe7
Author: faux <alcoholfox@gmail.com>
Date:   Sat May 18 05:57:21 2013 -0700

    Master Bug Fixes
    - Fixes wall under maintenance tunnel door.
    - Fixes AAAAHHHHHHHRRG psych office pressure issue.
    - Fixes some names and DMIs on some items. (in theory)

commit 22ea35cb8f6b8284b8bcdfd9375b64b8eb6d8c80
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 14:18:11 2013 +0200

    Added command reports to RP rev.

commit e932ac76b10de297814660651903237f4e6ff296
Merge: c25bbff 229fb46
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sat May 18 04:56:40 2013 -0700

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

    Conflicts:
    	code/game/objects/structures/crates_lockers/closets/secure/security.dm
    	code/modules/clothing/under/miscellaneous.dm
    	icons/mob/uniform.dmi
    	icons/obj/clothing/uniforms.dmi
    	icons/obj/custom_items.dmi
    	maps/tgstation.2.1.0.0.1.dmm

commit c1cefa4a80a68c21d708989ffdce8c5d640c7792
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 13:49:45 2013 +0200

    Added more debug logging to events.

commit e2249fa1775d288cf41263a4294d1230d42701e5
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 13:48:57 2013 +0200

    Added organ damage random medical event.

    It doesn't make a lot of sense, but who cares about that!

commit 90076f017a049962d15e0c4115f3aa7a6d3fa3f1
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 13:17:19 2013 +0200

    Added debug logging for events.

    Something's just not right about events still.

commit 335565cba7e310a0080e7a70c700ac3f87f5992c
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 13:10:07 2013 +0200

    Made RP rev use a different news story.

commit be197afc7744d037e4fe436b139c533c924372bf
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 13:06:16 2013 +0200

    Added system for newscaster events.

    This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.

commit c170f57ba738031fc3b1ca383d6e4d495e5b7562
Author: meyar <grimreaper219@hotmail.com>
Date:   Sat May 18 06:48:01 2013 -0400

    Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once.

commit f5924d6d00da081788544dcc6af47306f9a2e859
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 12:33:51 2013 +0400

    Fixes #2788. Added spawnpoints for sec.
    Fixes #2787. Added cameras to sec wing.
    Fixes #2783. Added missing Warden's locker.
    Fixed Armoury and Washroom doors access.
    Fixed maintenance door below Sec leading into a wall.
    Removed second maintenance door from Forensics. Leads into same maint tunnel, and it just few steps from another door.
    Fixed piping on airlock near Sec.
    Removed non-cycling arilock from near escape pod. There is cycling one nearby.

commit e4b610207b042c2a2249c492323be585113e4038
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 11:34:00 2013 +0200

    Make debug log accessible to mods and coders.

commit 48b78ea758dd1bb391443807c10278b65b697e1a
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 11:06:19 2013 +0200

    Re-added latespawn.

    Used in autotraitor and RP-revolution.

commit 0da9a4538e69a37c20116712fc1561246e26f649
Author: cib <cib123@googlemail.com>
Date:   Sat May 18 10:02:37 2013 +0200

    New debug log system.

    You can as admin toggle debug messages, VERY useful for devs and debugging the main server.

commit 229fb465abf2b957dfd5731155ce639aaf5c7b72
Merge: 88d5aa6 09a41d8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat May 18 00:10:09 2013 -0700

    Merge pull request #2786 from Mordeth221/patch-1

    New less obnoxious vote noise

commit 09a41d83cc09f86fd1d13cf129aac9a1a4ab2ea7
Author: Mordeth221 <brandonhoward03@hotmail.co.uk>
Date:   Fri May 17 17:44:39 2013 +0200

    New less obnoxious vote noise

commit a6c995e321d2d002fdfb1c79f4dbaed67e7dc0d7
Author: Mordeth221 <brandonhoward03@hotmail.co.uk>
Date:   Fri May 17 11:02:31 2013 +0200

    New less obnoxious vote noise

    And everyone will love this noise too!

commit 88d5aa67992b8df1f829aa32cdd0e0e37415cf1a
Merge: 5f8b7db d1862f4
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 17 07:47:16 2013 +0400

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

    Conflicts:
    	maps/tgstation.2.1.0.0.1.dmm

commit 5f8b7db6bdadabaa35cad4190f3b2758c5ccf5bc
Merge: 15b00b7 7b723bf
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 17 07:35:21 2013 +0400

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

commit d1862f433b8bb037b198e19c48a0a5996c264769
Author: Jamini <mobiousjami@gmail.com>
Date:   Thu May 16 23:18:33 2013 -0400

    More emergancy fixes. Like singulo escaping fixes. all wiring, all very vital unless you want rounds ending in 30mins

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

commit 9a8273bf647d69ac16a8eca2ce1fc350ac2ffd82
Author: Jamini <mobiousjami@gmail.com>
Date:   Thu May 16 23:04:31 2013 -0400

    Emergency Map fixes

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

commit cbaeb8afafa7059020dfd38b5f938d497fa65601
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 16 19:36:52 2013 -0700

    the adding of security spawn points removed the pipes underneath them in the security storage room. put pipes back.

commit 7b723bfb828fbdef2fafe3eacbae6876cb8b69bf
Merge: 25fe7aa 125991b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 18:30:10 2013 -0700

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

    BEF merge [waitabit]

commit 25fe7aab07f6a1db32107493c112f802e09dfd5d
Merge: 0e7b803 5b14c50
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 18:29:19 2013 -0700

    Merge pull request #2779 from Jamini/master

    Disposals Fix

commit 5b14c5081cb2741b620ace51f2cb06136f64efe3
Author: Jamini <mobiousjami@gmail.com>
Date:   Thu May 16 21:26:26 2013 -0400

    Adjustment

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

commit 125991b68dc632947d9217649d0756ac72f77cfa
Merge: bfc8784 5884f24
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 18:21:10 2013 -0700

    Merge pull request #2778 from SkyMarshal/bleeding-edge-freeze

    Adjusting air alarm settings.

commit 0e7b803d8e8e6fefa5c9b5963cbf5722ed49729a
Merge: db292f4 374e950
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 18:20:27 2013 -0700

    Merge pull request #2761 from havocx42/master

    Removing reverselist() from all bot pathing.

commit d2c9f11b4fc3c0d28285d6413e5babd7fee4ce4e
Author: Jamini <mobiousjami@gmail.com>
Date:   Thu May 16 21:10:03 2013 -0400

    Fixed a disposals bug. Playing with the big garbage pipes is now stupid again.

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

commit 5884f24f6a9db257a28a148b02336b7b711d28ff
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu May 16 17:29:58 2013 -0700

    Adjusting air alarm settings.
    "Scrubbing" is the default mode
    "Panic" empties the room
    "Fill" turns off the scrubbers and activates the vents in an effort to replace lost air
    "Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes
    "Replacement" will turn on the panic siphon while continuing to add air into the room
    "Off" will disable all attached devices. (This is useful for breached areas)

commit bfc878432110493a9afa46f14a566005333cd220
Merge: b203bc7 9d6f132
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 15:05:47 2013 -0700

    Merge pull request #2776 from SkyMarshal/bleeding-edge-freeze

    Added small glassdoor airlock and an air alarm to the server room to help prevent cooling of the rooms in that area by heat transfer.  Added atmospheric control computer to atmos.

commit 9d6f1328ede42ee4bf80ef9a6791f60dc44d5e07
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu May 16 15:04:45 2013 -0700

    Added small glassdoor airlock and an air alarm to the server room to help prevent cooling of the rooms in that area by heat transfer.  Added atmospheric control computer to atmos.

commit b203bc719c8afc4eb0181ca5e3a90b727a197d13
Merge: 31a0128 3836252
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 14:56:42 2013 -0700

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

    rogue pixel fixes

commit 3836252b27bdc6fe1027d81bc45e92a88977a957
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 16 14:55:07 2013 -0700

    rogue pixel fixes

commit 31a01286215d37f5c870b04e27dca7e0f486b762
Merge: ee374d6 1ebc8e3
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 14:32:08 2013 -0700

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

    BEF Map fixes/changes

commit ee374d69c09a9279ca4ab00e1f34b9560bb5517d
Merge: 92c48fe 5039828
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 16 10:46:04 2013 -0700

    Merge pull request #2774 from Roaper/master

    Hey Hey Hey! got it to work! Look at me now mah!

commit 92c48fe0b2dd4daccd1e2082bb76e18894320667
Merge: 5faabba 98a12ad
Author: Albert Iordache <iordachealbert@gmail.com>
Date:   Thu May 16 05:08:09 2013 -0700

    Merge pull request #2772 from Mloc/bleeding-edge-freeze

    Fixed up BrokenInHands a little.

commit 98a12ad82b1117a50ac9430de3a89c3d7174c8d9
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 16 13:05:23 2013 +0100

    Fixed up BrokenInHands a little.

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

commit 5faabba7fb34a03849fcfe512f777c77a8e19b97
Merge: 566454b db292f4
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 16 12:21:55 2013 +0100

    Merge branch 'master' into bleeding-edge-freeze

    Conflicts:
    	html/changelog.html

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

commit 566454b4c2b93ae04959d4d83efafee39e851a5c
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 16 12:35:59 2013 +0200

    gave debuggers proccall back

commit 1ebc8e3b91d50e7a0f7d4f9ddd440af51654f994
Author: Kilakk <kilakkindustries@gmail.com>
Date:   Wed May 15 20:35:23 2013 -0400

    BEF Map fixes/changes

    - Added spawnpoints for Security, Warden, and HoS
    - Moved some stuff around in Warden's office
    - Added the mysteriously missing Warden's locker
    - Changed the direction of a few windoors in the Brig
    - Made closing doors behind you in the Brig significantly easier

    - Added a camera to the Research Shuttle hallway

    - You no longer need Power Equipment access to enter the Engineering
    Lobby (Access to the engine still needs Power Equipment)

commit 5039828944a13859b895c9d699e6b01b276701fb
Author: Ian O'Malley <roaperable@gmail.com>
Date:   Wed May 15 15:55:58 2013 -0700

    4th times the charm.
    Added some stuff onto code/modules/events/money_spam.dm
    Added some stuff onto code/modules/flufftext/Dreaming.dm

    Signed-off-by: Ian O'Malley <roaperable@gmail.com>

commit 4f35f581c048bd03d9c4a19fd363c49dc7df1af0
Merge: e0f22c9 6e2879d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 15 14:37:07 2013 -0700

    Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze

    Air alarm fix, atmos control computer fix, item description fix.

commit 6e2879dc74083ae62354fd7996bb6277b417fdf2
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed May 15 14:36:32 2013 -0700

    Made an oopsie

commit 88a65b63e47a21c9216e5cf03cc69493e24782a1
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed May 15 14:31:31 2013 -0700

    Fixes air alarms going off if the upper bounds were set to disabled.
    Fixes atmos control computer displaying some air alarms in unreadable yellow
    Fixes a text error in item descriptions.

commit e0f22c9931b3e89af5ecafe58ae6d0bf06bdcfba
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 15 22:52:25 2013 +0200

    Turn off control_freak for profiling and stuff.

commit 5b177df027b58399236c6abe2cca073fde71158a
Merge: 917ce07 a1bc5d6
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 15 13:29:15 2013 -0700

    Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze

    Fixes air alarms freezing station an hour into round.

commit a1bc5d6cf0b656f129591f423f5716453ffc20bb
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed May 15 13:28:27 2013 -0700

    Fixes air alarms freezing station an hour into round.

commit 917ce079ab92a3f6e1730b9a3b90c8901c6cba43
Merge: 2c0d1c8 2b9130b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 15 11:35:15 2013 -0700

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

    Quick Fixes - BEF

commit 2b9130b00f2441d589a843ba6540721363e36d11
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed May 15 11:26:26 2013 -0700

    Quick Fixes
    - Changed access to security washroom so detective can go in.
    - Removed wall that was under maintence tunnel door.
    - Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
    - Added saloon dress to bar closet.

commit 15b00b733dfe16010bfea7a4eff672c15900db2d
Merge: b2ba650 2c0d1c8
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed May 15 20:13:35 2013 +0400

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

commit 374e950a32d8324905e1ba726034e417316dc78d
Author: Laurence Reading <havoc42@gmail.com>
Date:   Wed May 15 16:50:24 2013 +0100

    Removing reverselist() from all bot pathing

    As with my previous commit, reverselist() is causing problems in bot
    pathing, it is unnecessary. Bot pathing only worked when reverselist()
    was doing nothing.

commit 2c0d1c85e8c51bc121e29c86fa4f54d267860cb9
Merge: 345c2b1 62666d3
Author: Christian Bielert <cib123@googlemail.com>
Date:   Tue May 14 18:01:12 2013 -0700

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

    Adjustments to engineering based on community feedback.

commit 62666d34a6fa885795172066723fe965fd91829b
Author: Jamini <mobiousjami@gmail.com>
Date:   Tue May 14 18:25:29 2013 -0400

    Adjustments to engineering based on community feedback. Added magboots to the non-engineering hardsuit spawns in EVA.

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

commit 345c2b1f3cd6d4e84569bf8748d8a9b6a8bc8ac9
Merge: 7ba1a22 bb06a18
Author: Mloc <colmohici@gmail.com>
Date:   Tue May 14 12:24:09 2013 -0700

    Merge pull request #2752 from CIB/feature

    Improved the command report

commit 7ba1a22518fbbb01a2e79c334e8e59e6a4bcd24d
Merge: dc6cf51 32ea629
Author: Mloc <colmohici@gmail.com>
Date:   Tue May 14 12:23:03 2013 -0700

    Merge pull request #2756 from AppleMaster/master

    Maybe probably fixes some custom item?

commit bb06a18c3301391baea273a43fa0b55c5fa09926
Author: cib <cib123@googlemail.com>
Date:   Tue May 14 21:12:47 2013 +0200

    Reduced chance for changeling to be listed as suspect.

    Better than discussing this forever.

commit 32ea629eb375eb1d7c33b90462592e49eb25037f
Author: Apple_Master <cheeckan@gmail.com>
Date:   Tue May 14 18:09:20 2013 +0100

    Maybe fixes some custom items?

    Signed-off-by: Apple_Master <cheeckan@gmail.com>

commit dc6cf51309b6e052e7f628c481b6ec70ba98fb5a
Merge: c99fec1 ad6105b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue May 14 07:37:27 2013 -0700

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

    Merge main into BEF

commit ad6105b380ad1b93fb327c6203699f2ae8b983f9
Merge: c99fec1 8af44c5
Author: cib <cib123@googlemail.com>
Date:   Tue May 14 01:29:45 2013 +0200

    Merge remote-tracking branch 'main/master' into bleeding-edge-freeze

    Conflicts:
    	html/changelog.html

commit d12c3f9cf3d5e365c457820b7252a7b0004386c6
Author: cib <cib123@googlemail.com>
Date:   Tue May 14 00:58:49 2013 +0200

    Added a missing linebreak.

commit 28b40c3693aeee254adc45e02c9d09b7f1938942
Author: cib <cib123@googlemail.com>
Date:   Tue May 14 00:39:29 2013 +0200

    New command reports that aren't stupid.

    It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people.

commit c99fec15ef0c36d584833ea0d7fa1217fe378e3f
Merge: 1f1e37b 697ab3d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 13 10:57:53 2013 -0700

    Merge pull request #2748 from SkyMarshal/bleeding-edge-freeze

    Centcom now has sexy uniforms and IDs.  Emag now looks like modified standard ID card again.

commit 1f1e37b27e066aaceced3934598b4fe54cc958b6
Merge: e77e905 5b2f03d
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon May 13 10:57:05 2013 -0700

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

    Map Fixes - BEF

commit 5b2f03db10e81bd456704180e7c73bd7b8e26243
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sat May 11 09:33:45 2013 -0700

    Map Fixes - BEF
    - adjusts the piping and flooring panels in the new security wing.
    - fixes the piping around the new eva since they lead to nowhere.
    - adjusted the medbay lobby a bit, added a second chair behind the front desk.
    - added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.

commit 697ab3dd7f2429d331ed568df94f74fc7c03e7e7
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Sat May 11 03:34:14 2013 -0700

    Centcom now has sexy uniforms and IDs.  Emag now looks like modified standard ID card

commit e77e905c009c258683fba99208ecaf677eb12632
Merge: 52583c5 61cf1b2
Author: Mloc <colmohici@gmail.com>
Date:   Sat May 11 02:18:15 2013 -0700

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

    Sec Wing remap

commit 52583c53b2f35784572e3b9125f0d737eb8e009b
Merge: 5b13445 1726949
Author: Mloc <colmohici@gmail.com>
Date:   Sat May 11 02:16:47 2013 -0700

    Merge pull request #2744 from Spamcat/bef

    fixes

commit 61cf1b279d0bd8bb894c0b2a7fa581107e58c118
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 10 15:55:34 2013 +0400

    Security wing remap.

commit a9883979cef465f054ae329fe04213d5067a74fd
Merge: 1745bef 5b13445
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri May 10 15:28:32 2013 +0400

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

    Conflicts:
    	code/controllers/voting.dm

commit 5b13445e9540532000aed2bc925014d3173fce35
Merge: 849ec50 7118add
Author: Mloc <colmohici@gmail.com>
Date:   Wed May 8 11:27:37 2013 -0700

    Merge pull request #2743 from SkyMarshal/bleeding-edge-freeze

    Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.

commit 7118add9da9fb219c8aa3e8597de25ccc3b56d96
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed May 8 11:26:38 2013 -0700

    Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.

commit 17269494ef9007875c9bf9499dcaa26e68052b43
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed May 8 15:13:28 2013 +0400

    fixed #2737

commit 0decd3b0782d51c06f4af380beb6de0c48d6276c
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed May 8 15:12:25 2013 +0400

    Air alarm runtimes.
    fixed #2717

commit 849ec5052a3e952a6090cf73db377e8d00d8da1d
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon May 6 16:09:10 2013 +0100

    Fix for compiling on case sensitive filesystems.

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

commit 80e49b830ed125a0e631fd5f9c6f718661d15429
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon May 6 16:02:26 2013 +0100

    obligatory whoops!

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

commit 0c820277c82575e6aae0a9562d236fe8a05899e4
Merge: 27759f4 dad4430
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon May 6 15:45:09 2013 +0100

    Merge branch 'master' of github.com:Baystation12/Baystation12 into emergency-bef

commit 27759f47df6e6afab6714c39e562cbccf3036ee8
Merge: c33af03 ba8a159
Author: Mloc-Argent <colmohici@gmail.com>
Date:   Mon May 6 15:43:50 2013 +0100

    Merged master into BEF.

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

commit b2ba65001e7ad8013ade66e7962d89467a9a13c7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun May 5 20:24:33 2013 +0400

    Runtime fix. IV injecting from empty blood pack caused it. Now not doing a thing if no blood is injected.

commit c33af034d0b751464637329899214829a975a061
Merge: 45c9a3c b718bf5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu May 2 06:55:18 2013 -0700

    Merge pull request #2732 from Mloc/bleeding-edge-freeze

    Makes change game mode votes in pre-game lobby delay the roundstart.

commit b718bf5bf9df78b5131a8f849e1542440b2ca358
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 2 14:07:11 2013 +0100

    Makes change game mode votes in pre-game lobby delay the roundstart.  Fixes #2686.

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

commit 45c9a3cfd5210e6fe809a000a4eab29c3c962415
Merge: 48caebb cdb3466
Author: Mloc <colmohici@gmail.com>
Date:   Thu May 2 05:15:38 2013 -0700

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

    bef - security office door fix / hop attire closet

commit cdb3466cd90e1f323ce80118ba3cac022aa88a9f
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 2 03:19:23 2013 -0700

    may or may not fix issue of missing sprite for captain's uniform jacket.

commit fed2bfcedc62265034ea8e0b0ed6bc92a847d494
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu May 2 02:00:04 2013 -0700

    fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me.

commit e384c90093626669d8a38944667b9eb7b3a83cf3
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Apr 30 02:37:43 2013 -0700

    minor changes
    - Fixed accesses to security office doors.
    - Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
    - Fixed Writerer's custom item thing. Was attached to wrong character.

commit c25bbff8f046c367fdb9aafbb20a2adda493afbc
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Apr 30 01:18:17 2013 -0700

    fixed writerer's custom item

commit beaf1abd45fda7c23c90bf95fd21f420028801de
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Apr 30 01:06:05 2013 -0700

    minor changes
    - Fixed security accesses to the security office doors.
    - Put in a second HoP closet just for alternate uniforms for the HoP. Because the HoP uniform is piss ugly.

commit 48caebb9fbcb4c56f012e10e37c3922960e54ff8
Merge: 37b6e1e 74b4b26
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 28 04:55:11 2013 -0700

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

    Minor mapfixes

commit 37b6e1e691cc5ed9321863027cbb53291a85d5f6
Merge: 7c4be6e 9d83bd5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 28 04:54:39 2013 -0700

    Merge pull request #2719 from jediluke69/bleeding-edge-freeze

    Fixs my error in drinks and adds a shotgun shell ammo crate

commit 9d83bd52b5b4a8d8d08f556256e2ff09a7a936aa
Author: jediluke69 <zc96600@gmail.com>
Date:   Sat Apr 27 21:42:49 2013 -0400

    Added a shotgun shell ammo crate

commit a87a2abb3741986c23720b039f5e5fac0000a3c3
Author: jediluke69 <zc96600@gmail.com>
Date:   Sat Apr 27 20:14:51 2013 -0400

    Milkshakes and Rewriter should now have effects

commit e54b172a0970b7e9fca60660f890119235b69cbb
Author: jediluke69 <zc96600@gmail.com>
Date:   Sat Apr 27 19:53:06 2013 -0400

    fixes my silly mistake on drink results...

commit 74b4b26aef7d49a6f10e6f676bf6b1b1627f76b4
Author: Jamini <mobiousjami@gmail.com>
Date:   Sat Apr 27 09:11:38 2013 -0400

    Minor mapfixes

    Fixed wiring in sec office, removed redundant sec hardsuits, fixed some poorly placed firelocks, fixed a few names on doors, corrected EVA entrance access.

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

commit 7c4be6eea9d1f691cba9744c44982341351f99d7
Merge: 21ee07f bff28aa
Author: Hawk-v3 <hawk.v3@ntlworld.com>
Date:   Fri Apr 26 12:57:33 2013 -0700

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

    EVA and Engineering change voted by the community.

commit bff28aa174b13e7b4c00e4a9d207a9929648a4ed
Author: Jamini <mobiousjami@gmail.com>
Date:   Fri Apr 26 07:24:15 2013 -0400

    Engineering V5, voted by the community. Redid it trying to use the maptools (which still never seem to work for me!)

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

commit c3cdcf226ddd33d36bc3557ecb492d6f9a335ffb
Author: Jamini <mobiousjami@gmail.com>
Date:   Fri Apr 26 00:27:51 2013 -0400

    EVA and Engineering change voted by the community. Engineering V5 or something like that.

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

commit 21ee07f82da2516f08ba8c00dfe434d155cbbda0
Merge: b2cecc5 48a6326
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Apr 25 11:00:33 2013 -0700

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

    custom items update

commit b2cecc5028f2454649b54d297b8b571d6819b18e
Merge: 51f438d d9d09f7
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Thu Apr 25 10:47:30 2013 -0700

    Merge pull request #2705 from jediluke69/bleeding-edge-freeze

    less robusty nanopaste

commit 48a6326747c5fb4b88db3bd8a59f4e4a527cdb1e
Author: fauxtada <alcoholfox@gmail.com>
Date:   Thu Apr 25 00:57:55 2013 -0700

    custom items update
    - Michael Guess' golden lighter
    - Krinn's saucepan hat
    - Writerer's cat thing

commit d9d09f7b1d1e3eb36830937bdf0d7e6f411a88c4
Author: jediluke69 <zc96600@gmail.com>
Date:   Wed Apr 24 20:18:09 2013 -0400

    updated the Dreaded changelog

commit e256f2d095784c0a113246dc4acf3e2553d37cec
Author: jediluke69 <zc96600@gmail.com>
Date:   Wed Apr 24 19:41:51 2013 -0400

    should nerf nanopaste

commit 51f438dfdbc32b7ed4cd16430f1f8553cd67f1b8
Merge: 69cb687 85eb0f1
Author: Christian Bielert <cib123@googlemail.com>
Date:   Wed Apr 24 16:24:58 2013 -0700

    Merge pull request #2703 from jediluke69/bleeding-edge-freeze

    Adds new drinks and fixes a few things

commit 85eb0f12242b920cee9223b44c7e4b07e8a951fd
Author: jediluke69 <zc96600@gmail.com>
Date:   Wed Apr 24 18:48:55 2013 -0400

    Adds new drinks and fixes a few things

commit 69cb68732bf3a320e4d444a6fb04506e1a97b3af
Merge: 81d991a a710179
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Apr 24 13:24:25 2013 -0700

    Merge pull request #2699 from NerdyBoy1104/bleeding-edge-freeze

    Changelog update~

commit a710179c9da6fc80fa1c207e5b210a52f265feeb
Author: NerdyBoy1104 <NerdyBoy1104@gmail.com>
Date:   Wed Apr 24 19:17:11 2013 +0100

    Changelog update~ includes a small typo fix to faux's recent update too.

commit 61600803edc4f4a4eb063dab43bc83ae75467cd8
Merge: 78e934e 711577b
Author: NerdyBoy1104 <NerdyBoy1104@gmail.com>
Date:   Wed Apr 24 19:09:24 2013 +0100

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

    Conflicts:
    	html/changelog.html

commit 78e934e0d041bfbbc4b774652f8387c4afaa517d
Author: NerdyBoy1104 <NerdyBoy1104@gmail.com>
Date:   Wed Apr 24 18:58:45 2013 +0100

    Changelog update~ includes a fixed version of faux's changelog

commit 711577b73c27a9c6e567fa10036a32f253b64e2a
Author: NerdyBoy1104 <NerdyBoy1104@gmail.com>
Date:   Wed Apr 24 18:58:45 2013 +0100

    Changelog update~ includes a fixed version of faux's changelog

commit 1745befd08e3414700fa91eb9197d9892b539317
Merge: b6597c1 81d991a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Apr 24 21:54:00 2013 +0400

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

commit 81d991a41720b4c964e214b752ce88c7e19303d0
Merge: 47b28e5 a31bdff
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Apr 24 10:52:24 2013 -0700

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

    BEF - Player Requests Update

commit a31bdfffaa4cbed25704ed264b3dc588a0e7ae48
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed Apr 24 10:45:54 2013 -0700

    changelog

commit c1991ba0dde50dd0b697d4249271ad345fb87a26
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed Apr 24 03:04:35 2013 -0700

    Player Requests Edition
    - Two canes will spawn in medbay storage for people with leg injuries.
    - Added some more welding goggles for engineers in engineering.
    - Armory has a second security hardsuit.
    - CMO has hallway access to the medbay hardsuits.
    - HoS hat spawns in HoS closet.
    - White wedding dress spawns in chaplain closet.
    - Removed Pulse Rifle and Laser Canon from ERT room.
    - Detective's office will now start off with a cigeratte pack and a detective's flask.
    - Three normal boring flasks now spawn behind the bar for the bartender to give out.
    - Old Man Suit spawns in laundry room. - Requested by Book.
    - Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
    - Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.

commit 47b28e5cce88955c3abc13a64ed05886ba06d20c
Merge: c8b800e 272d792
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 23 16:15:05 2013 -0700

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

    Bleeding edge freeze - Map / Clothing changes

commit c8b800e6d9f047dd392eae78e7e0b236044d879f
Merge: 630af66 3900290
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 23 16:12:36 2013 -0700

    Merge pull request #2695 from NerdyBoy1104/bleeding-edge-freeze

    Small Hydroponics update.

commit 630af66468d2cc6381cd7b084569c5ea6167d86c
Merge: 5e65363 3bff68a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 23 16:09:04 2013 -0700

    Merge pull request #2693 from Mordeth221/bleeding-edge-freeze

    Custom APLU with fix

commit 390029007d97925b789d1263378cb20b6a2ca598
Author: NerdyBoy1104 <NerdyBoy1104@gmail.com>
Date:   Tue Apr 23 22:51:57 2013 +0100

    Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.

commit 3bff68a9a221615eb6dbb515efe4d7c758e52ea6
Author: Mordeth221 <brandonhoward03@hotmail.co.uk>
Date:   Tue Apr 23 23:11:12 2013 +0200

    Fixed icon_state of sven-kit to sven_kit

commit 83719e09de5b159e451df65d885ea25541dd9dc2
Author: Mordeth221 <altbrandon@hotmail.co.uk>
Date:   Tue Apr 23 21:37:40 2013 +0100

    Fixed a silly mistake

commit 76b2941803e64901321645e512b5171b6dbc1ade
Author: Mordeth221 <altbrandon@hotmail.co.uk>
Date:   Tue Apr 23 18:56:44 2013 +0100

    Added custom APLU

commit 272d7925cf698696760fa31bf79642626b93d1e3
Author: fauxtada <alcoholfox@gmail.com>
Date:   Mon Apr 22 13:29:23 2013 -0700

    Sorry, sorry!
    The last commit was full of compiling errors, this fixes that one.

commit 44a67167b3e5764634111b01b1c9c3b42574196a
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sun Apr 21 22:50:52 2013 -0700

    Uniform Closet Changes
    - Adjusted the items that spawn in the mixed wardrobe. Now includes:
    --- Colorful shoes.
    --- Plaid Skirts. Lady Power.
    --- Leather shoes.
    - Put dispatcher uniform in security closet for playtesting purposes.
    - Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff.

commit 47fcd8fc11f8cda966e7f0e45ce602d00fc1eccc
Author: fauxtada <alcoholfox@gmail.com>
Date:   Sun Apr 21 22:13:27 2013 -0700

    Map Changes
    - Turned the meeting hall into a public security office. -- http://baystation12.net/forums/viewtopic.php?f=5&t=7425
    - Moved posibrain to robotics.
    - Put a camera in the Psych office.
    - Hopefully fixed the APC on the floor in virology.
    - Got rid of green wardrobe closets - Replaced them with mixed wardrobe closets. I'm going to rework what spawns in them in a different commit.

commit b6597c13102c4e55a98d24990e757a5796912e82
Merge: d58ef35 5e65363
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Apr 20 12:11:52 2013 +0400

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

    Conflicts:
    	code/modules/surgery/braincore.dm

commit 5e653633327672b900b86610d72ff561038a4d31
Merge: 19fd262 0f570b5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Apr 20 01:00:47 2013 -0700

    Merge pull request #2681 from SkyMarshal/master

    XenoArch computer fix for BEF

commit 0f570b5dc8d9ec31e064231b11cea273cdb47424
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Fri Apr 19 16:34:50 2013 -0700

    Same XenoArch computer fix as in master branch.

commit 19fd262d0a4585f703ca3f40612c1390f3101b4d
Merge: bc21862 6a38e51
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Fri Apr 19 02:02:27 2013 -0700

    Merge pull request #2677 from SkyMarshal/bugfixes

    Atmos control auto-update fixes and other things.

commit 6a38e51c736e83f4d075d9f62b449001357e0884
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Fri Apr 19 01:43:58 2013 -0700

    Atmos control auto-update fixes
    Air alarms now auto-refresh and have a mechanism to heat or cool rooms.
    Space heaters can both heat and cool rooms

commit bc218625d8de1282503a340ab58fbc574f908f8f
Merge: 811fdf4 66cdc1a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Apr 18 22:37:02 2013 -0700

    Merge pull request #2675 from SkyMarshal/bugfixes

    Fixes #2674

commit 66cdc1a493256ea7d036455b8d87d1f8ad71c1d1
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 18 16:58:31 2013 -0700

    Fixes the runtimes.

commit 811fdf4774eb7c7a8122d44be863574cc3794605
Merge: b366998 2637c4d
Author: Jim "Apples" <cheeckan@gmail.com>
Date:   Thu Apr 18 12:48:02 2013 -0700

    Merge pull request #2673 from SkyMarshal/bugfixes

    See description

commit 2637c4d3dbfd6abb64f04c1b8038431424b9c02a
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 18 12:32:46 2013 -0700

    Readds air alarms that drop firelocks as well as the Central Atmos Control computer

commit ef38bc91bf8a9de20d968080ea84511685d3e0b1
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 18 12:10:20 2013 -0700

    Fixed some bugs with ZAS closed connections
    Sped up air equalization between zones
    Fixed an issue where space tiles were not removed from the zone.
    Made ZAS debug functions accessible when the mapping verbs are toggled on.

commit 846a8ec906f91794622bebdff96e9895c87bd80a
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 23:35:58 2013 -0700

    Experimental ZAS capability for heat to transfer through closed doors.

commit 1ccceb0e6ddb1e9370f99174ac70f960781d1e2e
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 22:46:34 2013 -0700

    Fixes an issue with fire leaving the trace_gases list full of nulls and revert some more of whatever Cael had done to that poor air-movement procedure.

commit b0d1d47c2378dfb005348ee89c53b99dc8e879b5
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 22:07:41 2013 -0700

    Fixes lighting, backpacks getting contaminated, and bombs not working.

commit 55183ca30a9346c48d44ead5be57793a68c72b3d
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 06:34:45 2013 -0700

    Fix for lighting before roundstart.

commit 9cf3ca497e851b4bb1059727199c3719083c3ace
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 02:05:51 2013 -0700

    Changeloooog~

commit 7827eec62975afb350336529610740fd9fd60cb5
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 01:51:18 2013 -0700

    Plasma no longer contaminates backpacks (They cannot be washed)
    Increased speed of zone equalization.
    Lighting controller and ticker now initialized after world is set up and a player has joined.

commit 2de1809c703e74b01343967277cafeb72668d3e2
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 01:36:05 2013 -0700

    Airflow now prevents doors being bumped open.
    Plasma settings changed as per Cacophony
    Airflow defaults changed as per Cacophony
    Plasma now has an effect other than what happens when breathed. (contamination readded)
    Washing machines now clean off contamination.

commit 76d561f003cb17b4549b7783b1412ffba23d70f2
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Wed Apr 17 00:45:36 2013 -0700

    Activated magboots will now, definitely, prevent airflow based grieving of your personage.  (Included is a possible fix for airflow opening doors by throwing you at them)
    Added in code to debug ZAS tile interactions, currently in the unchecked "Debug" file.
    The blasted FloodFill proc now works properly, and zones are connecting right (Should finally fix that damn part of medbay not connecting to the hallway)
    Plasma can contaminate again.
    The master controller and world startup code has been reworked for faster server boots.
    Fixed a runtime originating from a Away Mission map trying to create objects of type "null"

commit 690d6bbf06450484cec04187e42f221311a4c166
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Tue Apr 16 12:43:19 2013 -0700

    Fixes the bug with Filters allowing insane overpressurization.

commit e51c3ce3f054e4cec0122752b043d4bab3428a11
Author: Jupotter <jupotter.g@gmail.com>
Date:   Sat Apr 13 13:16:28 2013 +0300

    Fix a wrong null check in posibrain

    A wrong nullcheck that prevent posibrain searching for a player

commit ca4eb6431bde6932cd1f868cd1387260249eb76c
Author: Jupotter <jupotter.g@gmail.com>
Date:   Sat Apr 13 11:58:58 2013 +0300

    Add check forposibrain without brainmob

    This should never happen, but check nonetheless.

commit edba03441306c9994b2dcf76f06f111d8cddd0db
Author: jupotter <jupotter.g@gmail.com>
Date:   Fri Apr 12 19:16:08 2013 +0200

    Fix posibrain not turning off if no candidate

    The reset proc was checking for the presence of a brainmob, while one
    was created in the constructor. It should rather check the presence of a
    key

commit 96cefa43978136068a12cdadef260aef045181da
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 11 12:19:35 2013 -0700

    Compile fix.

commit 710e97bcc6151e75a4b6355ee0a7483745e33169
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 11 12:14:47 2013 -0700

    fuel is now a bit less derpy.  Napalm produces volatile fuel, and less of it.  Fire consumes more welding fuel.

commit 81c0c5cb6d1219f73b3d7833c4ca30d6cba5dd0c
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 11 11:50:29 2013 -0700

    Napalm can now be made, due to fire changes.

commit 5c5b7028b0a99b61aa2a10116998654b562cfc82
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Thu Apr 11 11:21:22 2013 -0700

    Fire update.  Should now burn out after a time, and temperature varies on a number of conditions.  Fixed a runtime, and made fire work in canisters.  Ingame modification of ZAS is now possible again.  Firedoors now remove duplicate firedoors on the same turf.

commit 2f6fdf556d3ed393d8499830daedb927434d721a
Author: Ravensdale <Tri@rdinn.com>
Date:   Tue Apr 16 08:47:23 2013 -0700

    final tweak for cap's PDA to do as advertised.

commit cda1248be71680177f586340b2fef3ff1447a92a
Author: Ravensdale <Tri@rdinn.com>
Date:   Tue Apr 16 08:43:19 2013 -0700

    Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes.

    Tweak: Removes captain's armour from spawn code.

    Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.

commit 6316d28208a4316915374542e52628c262988d23
Author: Ravensdale <Tri@rdinn.com>
Date:   Fri Apr 12 10:37:48 2013 -0700

    comments out suethecake's gun due to having a weapon's ban

commit 2272fbe255227d6634d328d866e08c1964ae3be8
Author: Asanadas <asanadas@hotmail.com>
Date:   Tue Apr 9 18:34:14 2013 -0400

    Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out.

commit fd08c89e0dae432debe218a61f999671670a9027
Author: Asanadas <asanadas@hotmail.com>
Date:   Tue Apr 9 18:33:37 2013 -0400

    Version 11 of RowtreeStation.dmm

commit f05b8e0083a4dfd3582959db4423705e4019f941
Author: SkyMarshal <skymarshal1729@gmail.com>
Date:   Mon Apr 8 23:59:42 2013 -0700

    Fixes issues:
    #2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
    #2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
    Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
    Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.

commit b366998eebb34db5bff532f8106d1bc582dd6b14
Merge: cfdd955 3fa1314
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Apr 18 04:42:42 2013 -0700

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

    Bleeding edge freeze - Swimsuits, Jacket, Formal Wear

commit 3fa1314c0199692685eb921a71e247198861a005
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed Apr 17 22:03:38 2013 -0700

    Fancy Formal Wear Overhaul
    - Adds female dress unforms to Captains, RD, and HoP's closets.
    - Fixes up the bride's dresses so they are working when spawned.
    - Fixed Wedding Branch. - five wedding dresses.
    - Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch.

commit 0d2598c55a556ba995000aa09739e6e50390b043
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed Apr 17 18:22:15 2013 -0700

    Adds female swimsuits to the atheltics closet. In theory. So no more certain female players running around the beach with their titties hanging out... In theory.

commit 98a8ebab4bf17359f413d411026d52c7d70ac046
Author: fauxtada <alcoholfox@gmail.com>
Date:   Wed Apr 17 17:02:48 2013 -0700

    Added Captain's Jacket to the Captain's Closet. Chinsky showed me how to do this, so I don't know how well it was done.

commit cfdd9553612ed08115d57d731bb8e90769dc6da2
Merge: a265a93 e40ff1b
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Apr 17 04:52:54 2013 -0700

    Merge pull request #2660 from Spamcat/bleeding-edge-freeze

    Folding batons

commit e40ff1bfc4dcae37f476bbddd10f5c6f93d2c943
Author: Spamcat <spamcat@derpy.ru>
Date:   Wed Apr 17 14:21:44 2013 +0400

    No need for dis shit.

commit a265a9342bdbee0d91c3da871e44f8e70164f533
Merge: 75814fc 3b95bf2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 16 16:15:05 2013 -0700

    Merge pull request #2661 from adammartinez271828/bleeding-edge-freeze

    Updates to sun.dm and solar.dm

commit 44401cf03ea4865b41cd2de4e5c682672f48e311
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Apr 15 22:23:09 2013 +0400

    Fixed blood overlays for batons. Also,changelog.

commit 75814fc6e0733872c5c4a16ae0ca2ae3a2784ee7
Merge: 0ea5010 b3c9484
Author: Chinsky <krauchinsky@gmail.com>
Date:   Mon Apr 15 05:47:31 2013 -0700

    Merge pull request #2658 from SniperYeti/bleeding-edge-freeze

    Custom item: Engineering Hat

commit d8f825894a1a3adf390fdbbc7d77f8f818023704
Author: Spamcat <spamcat@derpy.ru>
Date:   Mon Apr 15 02:47:48 2013 +0400

    Telescopic baton, biatch. Bastard child of baton and energy sword.
    Added one in HoS's locker.

commit b3c9484398705b723390618c2df08ae1cad055d8
Author: Yeti <mryeti97@gmail.com>
Date:   Sat Apr 13 14:32:11 2013 -0400

    Added Superboredguy's item: Engineering Hat

commit 0ea501039b8bc297dc4fb230183bfb936e1999d3
Merge: 8c17d44 4928a3a
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Apr 13 01:03:20 2013 -0700

    Merge pull request #2655 from SniperYeti/bleeding-edge-freeze

    Custom item: Old Camera

commit 8c17d44757d9eb6cdd68073ba0ec0347aeb8f1f3
Merge: 97b10f6 7d6b903
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Apr 13 00:59:29 2013 -0700

    Merge pull request #2651 from Spamcat/bleeding-edge-freeze

    Emergency smooth movement fix.

commit 4928a3aa599f90a67a66d285c6b19f85a5a5774e
Author: Yeti <mryeti97@gmail.com>
Date:   Fri Apr 12 22:40:24 2013 -0400

    Custom item: Old Camera

commit 7d6b903ed5d88fb400b01250508735aa4ccac261
Author: Spamcat <spamcat@derpy.ru>
Date:   Thu Apr 11 22:45:27 2013 +0400

    Fixed AI wiring.
    Ravensdale, thanks for the heads-up.

commit 13f34207e7c2bd5ac520f4f0f02e3fe6f758f474
Author: Spamcat <spamcat@derpy.ru>
Date:   Thu Apr 11 22:19:42 2013 +0400

    Emergency smooth movement fix.
    Seriously, stop that. Or at least test the map before committing. And use maptools ffs. :/

commit 97b10f69af29141ffb852077a2d7ac32ce0f18b4
Merge: fcf129b c624f54
Author: Chinsky <krauchinsky@gmail.com>
Date:   Wed Apr 10 02:57:57 2013 -0700

    Merge pull request #2647 from RavingManiac/bleeding-edge-freeze

    Sprites for narrow carpets altered to be less eye-meltingly baroque.

commit c624f54721b5c776cdb4a9d1b105bcbfb3750254
Author: RavingManiac <heisen51@gmail.com>
Date:   Wed Apr 10 01:36:59 2013 +0800

    Sprites for narrow carpets altered to be less eye-meltingly baroque.

commit fcf129b2423406abf235b105d2d316e8518c9caf
Merge: b283a3c 62867f0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Apr 9 03:16:03 2013 -0700

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

    Bleeding edge freeze - Map Edits

commit 62867f03f03e3d9d222ebcf75ec3cfa8f51f5d25
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Apr 9 03:06:54 2013 -0700

    Map Changes:

    - Replaced the boxing ring with a swimming pool. The holodeck already has a boxing ring setting, the other one is redundant.
    - Apparently having two airlocks in the same time makes ZAS not work so well. I've edited as many double airlocks as I could find, but there's probably more.
    - The Psych office is less ugly now. I can't really do anything about there being a see through door though. - No privacy for you!
    - Violin has been moved to theatre storage.

commit efd65fe495c06ce9b76b2ac13a716d67effe6906
Merge: 0a736e7 b283a3c
Author: fauxtada <alcoholfox@gmail.com>
Date:   Tue Apr 9 00:51:17 2013 -0700

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

commit b283a3cb86346db5a2a00e2c33955e2cb070df01
Merge: 4293e30 830f08f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Apr 7 21:48:14 2013 -0700

    Merge pull request #2634 from RavingManiac/bleeding-edge-freeze

    Various map tweaks

commit 3b95bf2279e2159f559f7a3f2af840bd6b6c32eb
Author: adammartinez271828 <adam.paul.martinez@gmail.com>
Date:   Sun Apr 7 10:17:41 2013 -0400

    Updates to sun.dm and solar.dm

    Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer.

commit 830f08f31a60eae876dc9a2354c999383eb8a9c2
Author: RavingManiac <heisen51@gmail.com>
Date:   Sun Apr 7 13:38:40 2013 +0800

    Space piano added to the bar.

commit 1878727417a7797744c53d4b6f5d4e84b96a68e3
Author: RavingManiac <heisen51@gmail.com>
Date:   Sat Apr 6 21:11:59 2013 +0800

    Nuke outpost altered to have a functional meeting room. Nuke operatives spawn in outpost barracks.

    Out-of-place tiles in research outpost replaced.

commit d8e2857013be33c525b96d455bba61649ed6b131
Merge: 506d944 4293e30
Author: RavingManiac <heisen51@gmail.com>
Date:   Sat Apr 6 19:09:21 2013 +0800

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

commit 4293e30fe4d358413fe0bab7bb1f8406b9d12c86
Merge: 9574aed 664ea3e
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Apr 5 21:30:01 2013 -0700

    Merge pull request #2628 from caelaislinn/bleeding-edge-freeze

    Added two-way smart cycling airlocks

commit 664ea3efa73abe6de98c994cd9bb929ead322f1b
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Fri Apr 5 16:12:31 2013 +1000

    added two-way smart cycling airlocks

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

commit 506d944f30e53ae2b31d3a84c1de476fdd4b239a
Author: RavingManiac <heisen51@gmail.com>
Date:   Fri Apr 5 03:11:52 2013 +0800

    Nuke operatives now spawn in the outpost next to the syndicate shuttle. Outpost window widened a bit. Syndicate shuttle shutters are open at round start.

    Glass door to the lobby added to the medbay reception desk.

commit 9574aedab1431b8b9e4f55fdd10e0744b2e72405
Merge: ff0b83e f3e1ff5
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Apr 4 01:33:53 2013 -0700

    Merge pull request #2620 from Asanadas/master

    Master into BEF

commit d58ef35b6fbd545c30849af9742a8773b8b28782
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sun Mar 17 04:41:42 2013 +0400

    Made vote play alarm sound when started.

commit bc69115b8f9e4bff30ead0920755d2adb1d35e6f
Merge: 76ecf64 0f6475c
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 16 21:13:49 2013 +0400

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

commit 76ecf647d7a6fac41289d9566b522eddc34b5925
Merge: bf68f83 14a96f7
Author: Chinsky <krauchinsky@gmail.com>
Date:   Sat Mar 16 21:06:57 2013 +0400

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

commit bf68f83546d2e1945dc2c89d93b55c3b6d57d6ea
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 15 00:32:27 2013 +0400

    Fixed brain surgery datum having duplicate class name.
    Made brain surgery into two steps, hemostat-fixovein.

commit 1486e4b48792211595287e3e693afb5a96c83cd5
Merge: ced4294 4c7f1f2
Author: Chinsky <krauchinsky@gmail.com>
Date:   Thu Mar 14 05:06:55 2013 +0400

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

commit ced4294be8dc57da244b614a7678cdf0f29f46c5
Merge: e34d033 16644b0
Author: Chinsky <krauchinsky@gmail.com>
Date:   Fri Mar 8 03:26:41 2013 +0400

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

commit e34d033cc94d5a534b11f4e9d9973c9466f9f3f6
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 12 20:43:22 2013 +0400

    Moved tag whitelist check to HELPERS.
    Removed img tag from whitelist.

commit fea160d6f0eb5814781f44853e43af7ccb4f91c6
Merge: c175833 fb25d2f
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Feb 12 19:39:00 2013 +0400

    Merge branch 'master' into HTML

commit c175833b9cb725493b25bc62ad4da99b54a58497
Author: Chinsky <krauchinsky@gmail.com>
Date:   Tue Jan 15 07:17:21 2013 +0400

    Started working on making paper use HTML instead of only BBCode again.
    Whitelisting system for tags.
    Blacklist for words like 'java' and names of even triggers.
    Might move to whitelist for those too, on Mini's suggestion.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Commented out end-round noises. Should actually work this time.
Deleted THUNDERDOME.ogg because I don't think it's ever been used.
Time to bloat the DB. Added Chris Hadfield's space station cover of Space Oddity. space_oddity.ogg is also a login screen theme.
Merge pull request #2898 from Asanadas/master

Sounds: Removed the bangin' donk from round end, added new lobby theme.
Added more useless fluff
Merge pull request #2871 from ciiol/bs-rtag

Fix radio keys localization.
Bar / Holodeck / Theatre / Hydroponics Revamp
- http://baystation12.net/forums/viewtopic.php?f=20&t=7692
- Added six new fields to the holodeck. Theatre, Meeting Hall, Picnic Area, Snow Field, Space Walk, and Desert.
- Added a Hydroponics Pasture that houses animals for botany. The Chef and Botanists have access to this area.
- Theatre was removed from the bar, replaced with bar. Chef was given an area to lay food out on, and more tables were added for sitting at. Had to move some disposal pipes around and the nav beacons. *crosses fingers* They probably work?
- Removed dispatcher uniform from closet, since it is being used as a general replacement security uniform. And that made Chinsky mad...
- Fixed airless tiles under airlocks.
- Replaced duplicate medical records computer behind medbay desk with Nanomed Plus.
- Pun Pun now has a different monkey sprite from the rest.
Merge pull request #2899 from Roaper/master

Yeah. Here.
Added Malsquando's eye sprites for later use. Also what appears to be a typofix.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Add station time to AI, new_player Status tab