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

Conflicts:
	code/game/mecha/mecha.dm

2014-08-06 15:22:56 -07:00

..

__DEFINES

added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.

2014-08-03 22:14:56 -03:00

__HELPERS

Refined the implementation of the AStar algorithm :

2014-07-12 21:58:32 +02:00

_globalvars

Merge pull request #4020 from caelaislinn/bugfix

2014-07-26 17:59:07 +01:00

_onclick

Merge pull request #4327 from Aranclanos/clickcooldowndefine

2014-08-05 10:22:52 +01:00

ATMOSPHERICS

…

controllers

Merge pull request #4299 from Jordie0608/turnsoutcentcommisracisttowardsalienlifeforms

2014-08-04 09:20:56 +01:00

datums

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

2014-08-06 15:22:56 -07:00

defines

Another lowercasing pass on a bunch of items and furnitures.

2014-07-27 19:14:40 +02:00

game

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

2014-08-06 15:22:56 -07:00

js

…

LINDA

…

modules

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

2014-08-06 15:22:56 -07:00

unused

…

WorkInProgress

Resolved conflicts:

2014-06-13 09:04:30 -06:00

_compile_options.dm

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

2014-07-07 13:42:31 -04:00

hub.dm

…

world.dm

Remove areas

2014-07-09 14:04:41 -04:00