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

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

2015-07-28 07:59:49 +02:00

..

computers

Fixes check_eye() for AI, pAI, and helm console

2015-07-11 23:26:57 -04:00

engines

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

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

ship.dm

Fix

2015-04-22 09:43:15 +03:00