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

..

ai_monitored.dm

-Made motion cameras use HasProximity if they aren't area based motion cameras. This will allow people to set up motion cameras that will set off, without having to be in an "AI Monitored" area, such as EVA.

2012-09-05 05:30:56 +00:00

areas.dm

mob/living/Life() now has basic gravity handling (no overrides).

2015-06-17 15:32:23 +02:00

asteroid_areas_old.dm

Mapping changes preparation

2015-02-09 18:53:02 +01:00

asteroid_areas.dm

Areas can now set their sound environments. Default is still 2 (room). For now only hallways and asteroid areas have different ones (hallway and stoneroom respectively)

2015-03-23 03:31:22 +03:00

Space Station 13 areas.dm

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

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