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

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2015-05-18 17:50:48 +02:00

..

obj

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

procs

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

2015-05-18 17:50:48 +02:00

obj.dm

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

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