PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

2015-09-27 13:36:56 +02:00

..

login.dm

Ports /tg/ & Paradise ghost sight.

2015-03-19 16:14:02 +01:00

logout.dm

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

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

observer.dm

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

2015-09-27 13:36:56 +02:00

say.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00