Merge branch 'master' into development

This commit is contained in:
skull132
2017-08-06 22:09:41 +03:00
28 changed files with 204 additions and 228 deletions
+2 -2
View File
@@ -68,8 +68,8 @@
spawn_area_type = /area/engineering/atmos
locstrings[numlocs] = "atmospherics"
if(LOC_INCIN)
spawn_area_type = /area/maintenance/incinerator
locstrings[numlocs] = "the incinerator"
spawn_area_type = /area/maintenance/disposal
locstrings[numlocs] = "waste disposal"
if(LOC_CHAPEL)
spawn_area_type = /area/chapel/main
locstrings[numlocs] = "the chapel"