cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/19/2017_submap_validation

Browse Source 
# Conflicts resolved:
#	code/unit_tests/map_tests.dm
This commit is contained in:
Neerti
2017-11-19 06:09:01 -05:00
parent 396f55fb17 3320690a1e
commit 73cb87c3a5
119 changed files with 15169 additions and 14900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/unit_tests/map_tests.dm
View File

@@ -13,8 +13,8 @@
/area/supply/station,
/area/mine,
/area/vacant/vacant_shop,
/area/submap
)
/area/turbolift,
/area/submap )
var/list/exempt_from_atmos = typesof(/area/maintenance,
/area/storage,
@@ -34,6 +34,11 @@
/area/vacant/vacant_shop
)
// Some maps have areas specific to the map, so include those.
exempt_areas += using_map.unit_test_exempt_areas
exempt_from_atmos += using_map.unit_test_exempt_from_atmos
exempt_from_apc += using_map.unit_test_exempt_from_apc
for(var/area/A in world)
if(A.z == 1 && !(A.type in exempt_areas))
area_test_count++