Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm

2015-08-21 16:15:07 +03:00

..

__defines

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

_helpers

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

_onclick

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

ATMOSPHERICS

Removes #undefine

2015-08-18 17:20:39 -04:00

controllers

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

datums

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

defines

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

FEA

…

game

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

js

…

modules

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03: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 branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

global.dm

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

hub.dm

…

names.dm

…

setup.dm

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

stylesheet.dm

…

world.dm

Merge with master.

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