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

Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm

2015-06-30 08:59:34 +02:00

..

datum_pool.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade

2015-06-05 13:24:03 +03:00

files.dm

…

game.dm

…

global_lists.dm

…

icons.dm

…

lists.dm

…

logging.dm

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

2015-06-07 10:51:41 +02:00

maths.dm

…

matrices.dm

Adds spinning animation for meteors.

2015-06-05 15:55:39 +02:00

mobs.dm

…

names.dm

…

sanitize_values.dm

…

text.dm

…

time.dm

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

2015-06-30 08:59:34 +02:00

turfs.dm

…

type2type.dm

…

unsorted.dm

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

2015-06-07 10:51:41 +02:00

vector.dm

…