Chinsky 0e08c90571 Merge branch 'dev-freeze' into dev ...

Conflicts:
	maps/tgstation2.dmm

2014-03-10 19:05:24 +04: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

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

Space Station 13 areas.dm

Merge branch 'dev-freeze' into dev

2014-03-10 19:05:24 +04:00