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

..

effects

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

items

Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014

2014-08-02 18:02:50 -07:00

structures

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

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

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

objs.dm

…

structures.dm

meteorhit() is kill

2014-04-22 12:16:02 -05:00

weapons.dm

…