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

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +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

mob/living/Life() now handles even more regular hud updates. Relocates action handling.

2015-06-17 16:09:13 +02:00

gases.dm

reorganize xgm into its own module

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

obj.dm

Adds 'Provisional' to the list of acting rank prefixes

2015-07-05 12:29:46 +01:00