PsiOmega ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm

2014-11-16 10:38:01 +01: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

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

2014-11-16 10:38:01 +01:00

Space Station 13 areas.dm

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

2014-11-11 14:13:02 +01:00