Chinsky 7555dd0f0b Merge branch 'master' into dev ...

Conflicts:
	code/setup.dm

2013-10-08 15:16:57 +04:00

..

beacon.dm

…

electropack.dm

…

encryptionkey.dm

Changed ERT headsets to correctly show the Supply channel

2013-07-29 22:31:47 -04:00

headset.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

intercom.dm

Fixes.

2013-10-07 20:35:26 +01:00

radio.dm

Removed outdated var, fixed failure to show garbled monkey speech.

2013-08-17 19:03:20 -07:00