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

..

obj

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

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

procs

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

gases.dm

reorganize xgm into its own module

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

obj.dm

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

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