Pete Goodfellow c7c3bd48de Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun ...

Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html

2013-06-15 18:58:11 +01:00

..

obj

Merge pull request #576 from SuperSayu/camerabug

2013-06-08 17:43:18 -07:00

procs

added two optimized pathfinds to replace AStar when it's called over short distances

2013-06-03 18:43:14 +10:00

obj.dm

Removed /obj/effect/begin and /obj/effect/laser. Both were unused.

2013-05-28 17:21:05 +01:00