Atlantis 1259d71710 Merge Conflict Fix

2015-05-11 07:58:44 +02:00

..

__HELPERS

new object-based lighting system

2015-05-10 20:54:25 +01:00

_onclick

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-05 22:13:58 +02:00

ATMOSPHERICS

remove the sub-area system

2015-05-10 17:06:29 +01:00

controllers

new object-based lighting system

2015-05-10 20:54:25 +01:00

datums

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

defines

Acting jobs now sort with non-acting jobs on the manifest.

2015-05-09 15:36:04 +01:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

Merge Conflict Fix

2015-05-11 07:58:44 +02:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

TriDimension

Grilles and rods.

2015-05-02 21:35:02 +02:00

ZAS

dynamic fire colours

2015-05-10 20:54:29 +01:00

global.dm

Merge remote-tracking branch 'upstream/dev' into CultPorting

2015-04-14 15:54:22 +02:00

hub.dm

…

names.dm

…

setup.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

stylesheet.dm

…

world.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00