Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -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

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

asteroid_areas_old.dm

Mapping changes preparation

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

asteroid_areas.dm

Port tg/paradise/good soft-edge lighting

2017-04-12 19:11:45 -04:00

Away Mission areas.dm

Reactivates Away Gate (#528)

2016-09-06 13:36:04 -04:00

Space Station 13 areas_vr.dm

Added the Tether Backup Shuttle

2017-05-01 20:30:43 -04:00

Space Station 13 areas.dm

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00