Merge with dev.

This commit is contained in:
Zuhayr
2015-02-05 20:17:24 +10:30
78 changed files with 2949 additions and 2409 deletions

View File

@@ -31,7 +31,7 @@
spawn_area_type = /area/crew_quarters/kitchen
locstring = "the kitchen"
if(LOC_ATMOS)
spawn_area_type = /area/atmos
spawn_area_type = /area/engineering/atmos
locstring = "atmospherics"
if(LOC_INCIN)
spawn_area_type = /area/maintenance/incinerator