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

Conflicts:
	code/game/machinery/doors/airlock.dm

2014-10-05 13:24:14 +02:00

..

__DEFINES

Resolved conflicts and addressed maintainer feedback.

2014-09-21 15:30:54 -06:00

__HELPERS

Fixes a bunch of saycode things. Objs can now hear radio talk.

2014-09-27 16:06:06 +02:00

_globalvars

Merge pull request #4960 from Incoming5643/zlevel

2014-09-29 10:42:49 -05:00

_onclick

Merge pull request #4949 from hornygranny/alienpockets

2014-10-04 23:53:06 -05:00

ATMOSPHERICS

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

2014-09-25 18:45:53 +02:00

controllers

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

datums

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

defines

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

game

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

2014-10-05 13:24:14 +02:00

js

…

LINDA

…

modules

Merge pull request #4966 from JJRcop/whisper-dead-dead

2014-10-05 00:40:28 -05:00

unused

Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire

2014-09-24 16:58:23 +02:00

WorkInProgress

…

_compile_options.dm

…

hub.dm

…

world.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00