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

Conflicts:
	code/modules/mob/living/carbon/human/inventory.dm

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

..

job

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

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

access.dm

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

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

departments.dm

Cloning now requires meat for biomass.

2013-03-11 18:20:02 +01:00

job_controller.dm

Fixes #10129

2015-07-14 05:18:58 +09:30

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