Sawu 87881ffb94 Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-01-17 09:55:12 +11: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

SubSystem rewrite

2014-12-31 13:25:41 +00:00

Space Station 13 areas.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded

2015-01-17 09:55:12 +11:00