Kelenius 6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm

2015-08-21 16:59:57 +03:00

..

__defines

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

_helpers

Merge pull request #10101 from mwerezak/shards

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

_onclick

Merge pull request #10101 from mwerezak/shards

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

ATMOSPHERICS

Removes #undefine

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

controllers

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

2015-08-19 07:04:40 +01: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

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

game

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

js

…

modules

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +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

Cleans up dynamic member lookup

2015-08-18 17:20:37 -04: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