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

Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-08-27 08:53:22 +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

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

2015-08-10 17:56:14 +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-27 08:53:22 +02:00