Mloc-Argent 9896e44d8a Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/unsorted.dm

2014-06-12 18:56:26 +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

APC bugfix after someone messed with mah areas!

2014-04-01 03:06:58 -05:00

Space Station 13 areas.dm

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

2014-06-12 18:56:26 +01:00