PsiOmega e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-18 18:29:01 +02:00

..

__defines

Merge with master.

2015-08-18 11:31:10 -07:00

_helpers

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

2015-08-18 18:29:01 +02:00

_onclick

On merge changes and map conflict fixes.

2015-08-18 18:19:51 +02:00

ATMOSPHERICS

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs

2015-08-18 12:06:53 -07:00

controllers

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-17 09:37:49 +02:00

datums

Merge with master.

2015-08-18 11:31:10 -07:00

defines

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

2015-08-18 18:29:01 +02:00

FEA

…

game

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

2015-08-18 18:29:01 +02:00

js

…

modules

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

2015-08-18 18:29:01 +02:00

TriDimension

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

ZAS

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-18 18:05:16 +02:00

global.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Merge with master.

2015-08-18 11:31:10 -07:00