MrPerson 2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam ...

Conflicts:
	code/modules/mob/living/living.dm

2014-10-25 23:25:27 -07: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 branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam

2014-10-25 23:25:27 -07:00

Space Station 13 areas.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00