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

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

camera_assembly.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

camera.dm

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

2015-06-30 08:24:43 +02:00

motion.dm

General update.

2015-02-23 10:32:25 +01:00

presets.dm

Fixes drone runtime.

2015-06-28 19:02:23 +02:00

tracking.dm

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

2015-06-14 10:35:29 +02:00