Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

__HELPERS

Changes Telescience to Projectile Trajectory!

2013-11-28 17:50:09 +04:00

_onclick

Hud icons will now also update with their usual icons and states

2013-11-23 04:43:45 -06:00

ATMOSPHERICS

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

controllers

Hmm hmm, it could help to actually commit the hooks.dm file, couldn't it?

2013-11-25 21:19:58 +00:00

datums

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

defines

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

FEA

…

game

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

js

…

modules

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

TriDimension

…

unused

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

WorkInProgress

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

ZAS

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

global.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

hub.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

names.dm

…

setup.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

stylesheet.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

world.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00