GunHog 63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm

2014-10-22 17:49:52 -05:00

..

__DEFINES

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

__HELPERS

Merge pull request #5319 from phil235/InjectFix

2014-10-20 20:04:39 -07:00

_globalvars

…

_onclick

Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition

2014-10-22 17:49:52 -05:00

ATMOSPHERICS

Merge pull request #5383 from Donkie/atmostankfixes

2014-10-22 10:50:16 -07:00

controllers

Merge pull request #5240 from paprka/assantag

2014-10-20 20:19:08 -07:00

datums

Merge pull request #5397 from Jordie0608/nowweneedassistantsanctuaries

2014-10-22 10:55:52 -07:00

defines

…

game

Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition

2014-10-22 17:49:52 -05:00

js

…

LINDA

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

modules

Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition

2014-10-22 17:49:52 -05:00

unused

…

WorkInProgress

Fix cyborg flashes being useable in flashers and cyborg heads.

2014-10-19 04:35:10 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

…