Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +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

Poultice potency, bugfixes

2013-11-14 15:21:29 -05:00

Space Station 13 areas.dm

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00