GinjaNinja32 314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm

2015-06-02 17:33:20 +01:00

..

__HELPERS

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

_defines

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

_onclick

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

ATMOSPHERICS

Compile fix

2015-05-30 11:55:47 +01:00

controllers

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00

datums

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

defines

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01: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 remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

js

…

modules

reorganize xgm into its own module

2015-06-02 16:29:23 +01:00

TriDimension

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

ZAS

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

reorganize xgm into its own module

2015-06-02 16:29:23 +01:00

stylesheet.dm

…

world.dm

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00