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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm

2015-06-07 10:51:41 +02: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

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -04: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