PsiOmegaDelta e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm

2015-08-11 08:21:06 +02: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

Makes the new initialization message use the proper method.

2015-08-10 17:46:38 +02:00

asteroid_areas_old.dm

Mapping changes preparation

2015-02-09 18:53:02 +01:00

asteroid_areas.dm

Areas can now set their sound environments. Default is still 2 (room). For now only hallways and asteroid areas have different ones (hallway and stoneroom respectively)

2015-03-23 03:31:22 +03:00

Space Station 13 areas.dm

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

2015-08-11 08:21:06 +02:00