PsiOmegaDelta c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney ...

Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm

2015-08-13 08:06:11 +02:00

..

job

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

_access_defs.dm

Generalizes access definitions.

2015-06-02 18:11:46 +02:00

access_datum.dm

Removes the mint access definitions.

2015-07-26 11:25:35 +02:00

access.dm

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

2015-07-27 09:53:08 +02:00

job_controller.dm

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

jobprocs.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

jobs.dm

Adds paramedic to the medical category. Fixes #8255

2015-02-26 16:37:27 -05:00

whitelist.dm

Removed Taj hackfix

2014-10-09 06:20:15 +10:30