xxalpha 06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea

2016-01-30 01:29:26 +00: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/master' into blueprintsarea

2016-01-30 01:29:26 +00:00

Space Station 13 areas.dm

Merge Conflict Fix

2016-01-20 14:07:14 +02:00